NOISSUE reorganize and document libraries

360 files changed, 24936 insertions, 33621 deletions

diff --git a/libraries/README.md b/libraries/README.md
new file mode 100644
index 00000000..809acb16
--- /dev/null
+++ b/libraries/README.md
@@ -0,0 +1,145 @@
+# Third-party libraries
+
+This folder has third-party or otherwise external libraries needed for other parts to work.
+
+## classparser
+A simplistic parser for Java class files.
+
+This library has served as a base for some (much more full-featured and advanced) work under NDA for AVG. It, however, should NOT be confused with that work.
+
+Copyright belongs to Petr Mrázek, unless explicitly stated otherwise in the source files. Available under the Apache 2.0 license.
+
+## hoedown
+Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté.
+
+See [github repo](https://github.com/hoedown/hoedown).
+
+## iconfix
+This was originally part of the razor-qt project and the Qt toolkit, respecitvely. Its sole purpose is to reimplement Qt's icon loading logic to prevent it from using any platform plugins that could break icon loading.
+
+Licensed under LGPL 2.1
+
+## javacheck
+Simple Java tool that prints the JVM details - version and platform bitness.
+
+Do what you want with it. It is so trivial that noone cares.
+
+## launcher
+Java launcher part for Minecraft.
+
+It:
+* Starts a process
+* Waits for a launch script on stdin
+* Consumes the launch script you feed it
+* Proceeds with launch when it gets the `launcher` command
+
+This means the process is essentially idle until the final command is sent. You can, for example, attach a profiler before you send it.
+
+A `legacy` and `onesix` launchers are available.
+
+* `legacy` is intended for use with Minecraft versions < 1.6 and is deprecated.
+* `onesix` can handle launching any Minecraft version, at the cost of some extra features `legacy` enables (custom window icon and title).
+
+Example (some parts have been censored):
+```
+mod legacyjavafixer-1.0
+mainClass net.minecraft.launchwrapper.Launch
+param --username
+param CENSORED
+param --version
+param MultiMC5
+param --gameDir
+param /home/peterix/minecraft/FTB/17ForgeTest/minecraft
+param --assetsDir
+param /home/peterix/minecraft/mmc5/assets
+param --assetIndex
+param 1.7.10
+param --uuid
+param CENSORED
+param --accessToken
+param CENSORED
+param --userProperties
+param {}
+param --userType
+param mojang
+param --tweakClass
+param cpw.mods.fml.common.launcher.FMLTweaker
+windowTitle MultiMC: 172ForgeTest
+windowParams 854x480
+userName CENSORED
+sessionId token:CENSORED:CENSORED
+cp /home/peterix/minecraft/FTB/libraries/com/mojang/realms/1.3.5/realms-1.3.5.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar
+cp /home/peterix/minecraft/FTB/libraries/java3d/vecmath/1.3.1/vecmath-1.3.1.jar
+cp /home/peterix/minecraft/FTB/libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar
+cp /home/peterix/minecraft/FTB/libraries/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar
+cp /home/peterix/minecraft/FTB/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar
+cp /home/peterix/minecraft/FTB/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar
+cp /home/peterix/minecraft/FTB/libraries/io/netty/netty-all/4.0.10.Final/netty-all-4.0.10.Final.jar
+cp /home/peterix/minecraft/FTB/libraries/com/google/guava/guava/16.0/guava-16.0.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar
+cp /home/peterix/minecraft/FTB/libraries/commons-codec/commons-codec/1.9/commons-codec-1.9.jar
+cp /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar
+cp /home/peterix/minecraft/FTB/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar
+cp /home/peterix/minecraft/FTB/libraries/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar
+cp /home/peterix/minecraft/FTB/libraries/com/mojang/authlib/1.5.16/authlib-1.5.16.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.1/lwjgl_util-2.9.1.jar
+cp /home/peterix/minecraft/FTB/libraries/tv/twitch/twitch/5.16/twitch-5.16.jar
+cp /home/peterix/minecraft/FTB/libraries/net/minecraftforge/forge/1.7.10-10.13.0.1178/forge-1.7.10-10.13.0.1178.jar
+cp /home/peterix/minecraft/FTB/libraries/net/minecraft/launchwrapper/1.9/launchwrapper-1.9.jar
+cp /home/peterix/minecraft/FTB/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar
+cp /home/peterix/minecraft/FTB/libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.jar
+cp /home/peterix/minecraft/FTB/libraries/com/typesafe/config/1.2.1/config-1.2.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-actors-migration_2.11/1.1.0/scala-actors-migration_2.11-1.1.0.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-compiler/2.11.1/scala-compiler-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-library_2.11/1.0.2/scala-continuations-library_2.11-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-plugin_2.11.1/1.0.2/scala-continuations-plugin_2.11.1-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar
+cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar
+cp /home/peterix/minecraft/FTB/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar
+ext /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl-platform/2.9.1/lwjgl-platform-2.9.1-natives-linux.jar
+ext /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar
+natives /home/peterix/minecraft/FTB/17ForgeTest/natives
+cp /home/peterix/minecraft/FTB/versions/1.7.10/1.7.10.jar
+launcher onesix
+```
+
+Available under the Apache 2.0 license.
+
+## libnbtplusplus
+libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag (NBT). It can read and write compressed and uncompressed NBT files and provides a code interface for working with NBT data.
+
+See [github repo](https://github.com/ljfa-ag/libnbtplusplus).
+
+Available either under LGPL version 3 or later.
+
+## pack200
+Unpacks pack200 archives (squished, compression-optimized Java jars). This format is only used by Forge to save bandwidth.
+
+A horrible little thing extracted from the depths of the OpenJDK codebase. Please don't look at it, or you will praise Cthulhu for his clean code for the rest of your days.
+
+Available under GPL 2 with classpath exception.
+
+## rainbow
+Color functions extracted from [KGuiAddons](https://inqlude.org/libraries/kguiaddons.html). Used for adaptive text coloring.
+
+Available either under LGPL version 2.1 or later.
+
+## xz-embedded
+Tiny implementation of LZMA2 de/compression. This format is only used by Forge to save bandwidth.
+
+Public domain.
\ No newline at end of file
diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt
new file mode 100644
index 00000000..a6c3fa14
--- /dev/null
+++ b/libraries/classparser/CMakeLists.txt
@@ -0,0 +1,41 @@
+project(classparser)
+
+set(CMAKE_AUTOMOC ON)
+
+######## Check endianness ########
+include(TestBigEndian)
+test_big_endian(BIGENDIAN)
+if(${BIGENDIAN})
+	add_definitions(-DMULTIMC_BIG_ENDIAN)
+endif(${BIGENDIAN})
+
+# Find Qt
+find_package(Qt5Core REQUIRED)
+
+# Include Qt headers.
+include_directories(${Qt5Base_INCLUDE_DIRS})
+
+set(CLASSPARSER_HEADERS
+# Public headers
+include/classparser_config.h
+include/javautils.h
+
+# Private headers
+src/annotations.h
+src/classfile.h
+src/constants.h
+src/errors.h
+src/javaendian.h
+src/membuffer.h
+)
+
+set(CLASSPARSER_SOURCES
+src/javautils.cpp
+src/annotations.cpp
+)
+
+add_definitions(-DCLASSPARSER_LIBRARY)
+
+add_library(classparser SHARED ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
+target_include_directories(classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+qt5_use_modules(classparser Core)
diff --git a/libraries/logic/minecraft/forge/LegacyForge.h b/libraries/classparser/include/classparser_config.h
index f51d5e85..bfd4dcb4 100644
--- a/libraries/logic/minecraft/forge/LegacyForge.h
+++ b/libraries/classparser/include/classparser_config.h
@@ -13,13 +13,10 @@
  * limitations under the License.
  */
 
-#pragma once
+#include <QtCore/QtGlobal>
 
-#include "minecraft/Mod.h"
-
-class MinecraftForge : public Mod
-{
-public:
-	MinecraftForge(const QString &file);
-	bool FixVersionIfNeeded(QString newVersion);
-};
+#ifdef CLASSPARSER_LIBRARY
+#define CLASSPARSER_EXPORT Q_DECL_EXPORT
+#else
+#define CLASSPARSER_EXPORT Q_DECL_IMPORT
+#endif
diff --git a/libraries/logic/minecraft/OpSys.h b/libraries/classparser/include/javautils.h
index 9ebea3de..43cca4bc 100644
--- a/libraries/logic/minecraft/OpSys.h
+++ b/libraries/classparser/include/javautils.h
@@ -1,5 +1,7 @@
 /* Copyright 2013-2015 MultiMC Contributors
  *
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,26 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 #include <QString>
-enum OpSys
-{
-	Os_Windows,
-	Os_Linux,
-	Os_OSX,
-	Os_Other
-};
+#include "classparser_config.h"
 
-OpSys OpSys_fromString(QString);
-QString OpSys_toString(OpSys);
+#define MCVer_Unknown "Unknown"
 
-#ifdef Q_OS_WIN32
-#define currentSystem Os_Windows
-#else
-#ifdef Q_OS_MAC
-#define currentSystem Os_OSX
-#else
-#define currentSystem Os_Linux
-#endif
-#endif
\ No newline at end of file
+namespace javautils
+{
+/**
+ * @brief Get the version from a minecraft.jar by parsing its class files. Expensive!
+ */
+QString GetMinecraftJarVersion(QString jar);
+}
diff --git a/libraries/classparser/src/annotations.cpp b/libraries/classparser/src/annotations.cpp
new file mode 100644
index 00000000..d1a7c046
--- /dev/null
+++ b/libraries/classparser/src/annotations.cpp
@@ -0,0 +1,85 @@
+#include "classfile.h"
+#include "annotations.h"
+#include <sstream>
+
+namespace java
+{
+std::string annotation::toString()
+{
+	std::ostringstream ss;
+	ss << "Annotation type : " << type_index << " - " << pool[type_index].str_data << std::endl;
+	ss << "Contains " << name_val_pairs.size() << " pairs:" << std::endl;
+	for (unsigned i = 0; i < name_val_pairs.size(); i++)
+	{
+		std::pair<uint16_t, element_value *> &val = name_val_pairs[i];
+		auto name_idx = val.first;
+		ss << pool[name_idx].str_data << "(" << name_idx << ")"
+		   << " = " << val.second->toString() << std::endl;
+	}
+	return ss.str();
+}
+
+annotation *annotation::read(util::membuffer &input, constant_pool &pool)
+{
+	uint16_t type_index = 0;
+	input.read_be(type_index);
+	annotation *ann = new annotation(type_index, pool);
+
+	uint16_t num_pairs = 0;
+	input.read_be(num_pairs);
+	while (num_pairs)
+	{
+		uint16_t name_idx = 0;
+		// read name index
+		input.read_be(name_idx);
+		auto elem = element_value::readElementValue(input, pool);
+		// read value
+		ann->add_pair(name_idx, elem);
+		num_pairs--;
+	}
+	return ann;
+}
+
+element_value *element_value::readElementValue(util::membuffer &input,
+											   java::constant_pool &pool)
+{
+	element_value_type type = INVALID;
+	input.read(type);
+	uint16_t index = 0;
+	uint16_t index2 = 0;
+	std::vector<element_value *> vals;
+	switch (type)
+	{
+	case PRIMITIVE_BYTE:
+	case PRIMITIVE_CHAR:
+	case PRIMITIVE_DOUBLE:
+	case PRIMITIVE_FLOAT:
+	case PRIMITIVE_INT:
+	case PRIMITIVE_LONG:
+	case PRIMITIVE_SHORT:
+	case PRIMITIVE_BOOLEAN:
+	case STRING:
+		input.read_be(index);
+		return new element_value_simple(type, index, pool);
+	case ENUM_CONSTANT:
+		input.read_be(index);
+		input.read_be(index2);
+		return new element_value_enum(type, index, index2, pool);
+	case CLASS: // Class
+		input.read_be(index);
+		return new element_value_class(type, index, pool);
+	case ANNOTATION: // Annotation
+		// FIXME: runtime visibility info needs to be passed from parent
+		return new element_value_annotation(ANNOTATION, annotation::read(input, pool), pool);
+	case ARRAY: // Array
+		input.read_be(index);
+		for (int i = 0; i < index; i++)
+		{
+			vals.push_back(element_value::readElementValue(input, pool));
+		}
+		return new element_value_array(ARRAY, vals, pool);
+	default:
+		throw new java::classfile_exception();
+	}
+}
+}
\ No newline at end of file
diff --git a/libraries/classparser/src/annotations.h b/libraries/classparser/src/annotations.h
new file mode 100644
index 00000000..aa25d241
--- /dev/null
+++ b/libraries/classparser/src/annotations.h
@@ -0,0 +1,277 @@
+#pragma once
+#include "classfile.h"
+#include <map>
+#include <vector>
+
+namespace java
+{
+enum element_value_type : uint8_t
+{
+	INVALID = 0,
+	STRING = 's',
+	ENUM_CONSTANT = 'e',
+	CLASS = 'c',
+	ANNOTATION = '@',
+	ARRAY = '[',			// one array dimension
+	PRIMITIVE_INT = 'I',	// integer
+	PRIMITIVE_BYTE = 'B',   // signed byte
+	PRIMITIVE_CHAR = 'C',   // Unicode character code point in the Basic Multilingual Plane,
+							// encoded with UTF-16
+	PRIMITIVE_DOUBLE = 'D', // double-precision floating-point value
+	PRIMITIVE_FLOAT = 'F',  // single-precision floating-point value
+	PRIMITIVE_LONG = 'J',   // long integer
+	PRIMITIVE_SHORT = 'S',  // signed short
+	PRIMITIVE_BOOLEAN = 'Z' // true or false
+};
+/**
+ * The element_value structure is a discriminated union representing the value of an
+ *element-value pair.
+ * It is used to represent element values in all attributes that describe annotations
+ * - RuntimeVisibleAnnotations
+ * - RuntimeInvisibleAnnotations
+ * - RuntimeVisibleParameterAnnotations
+ * - RuntimeInvisibleParameterAnnotations).
+ *
+ * The element_value structure has the following format:
+ */
+class element_value
+{
+protected:
+	element_value_type type;
+	constant_pool &pool;
+
+public:
+	element_value(element_value_type type, constant_pool &pool) : type(type), pool(pool) {};
+
+	element_value_type getElementValueType()
+	{
+		return type;
+	}
+
+	virtual std::string toString() = 0;
+
+	static element_value *readElementValue(util::membuffer &input, constant_pool &pool);
+};
+
+/**
+ * Each value of the annotations table represents a single runtime-visible annotation on a
+ * program element.
+ * The annotation structure has the following format:
+ */
+class annotation
+{
+public:
+	typedef std::vector<std::pair<uint16_t, element_value *>> value_list;
+
+protected:
+	/**
+	 * The value of the type_index item must be a valid index into the constant_pool table.
+	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
+	 * representing a field descriptor representing the annotation type corresponding
+	 * to the annotation represented by this annotation structure.
+	 */
+	uint16_t type_index;
+	/**
+	 * map between element_name_index and value.
+	 *
+	 * The value of the element_name_index item must be a valid index into the constant_pool
+	 *table.
+	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
+	 *representing
+	 * a valid field descriptor (§4.3.2) that denotes the name of the annotation type element
+	 *represented
+	 * by this element_value_pairs entry.
+	 */
+	value_list name_val_pairs;
+	/**
+	 * Reference to the parent constant pool
+	 */
+	constant_pool &pool;
+
+public:
+	annotation(uint16_t type_index, constant_pool &pool)
+		: type_index(type_index), pool(pool) {};
+	~annotation()
+	{
+		for (unsigned i = 0; i < name_val_pairs.size(); i++)
+		{
+			delete name_val_pairs[i].second;
+		}
+	}
+	void add_pair(uint16_t key, element_value *value)
+	{
+		name_val_pairs.push_back(std::make_pair(key, value));
+	}
+	;
+	value_list::const_iterator begin()
+	{
+		return name_val_pairs.cbegin();
+	}
+	value_list::const_iterator end()
+	{
+		return name_val_pairs.cend();
+	}
+	std::string toString();
+	static annotation *read(util::membuffer &input, constant_pool &pool);
+};
+typedef std::vector<annotation *> annotation_table;
+
+/// type for simple value annotation elements
+class element_value_simple : public element_value
+{
+protected:
+	/// index of the constant in the constant pool
+	uint16_t index;
+
+public:
+	element_value_simple(element_value_type type, uint16_t index, constant_pool &pool)
+		: element_value(type, pool), index(index) {
+										 // TODO: verify consistency
+									 };
+	uint16_t getIndex()
+	{
+		return index;
+	}
+	virtual std::string toString()
+	{
+		return pool[index].toString();
+	}
+	;
+};
+/// The enum_const_value item is used if the tag item is 'e'.
+class element_value_enum : public element_value
+{
+protected:
+	/**
+	 * The value of the type_name_index item must be a valid index into the constant_pool table.
+	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
+	 * representing a valid field descriptor (§4.3.2) that denotes the internal form of the
+	 * binary
+	 * name (§4.2.1) of the type of the enum constant represented by this element_value
+	 * structure.
+	 */
+	uint16_t typeIndex;
+	/**
+	 * The value of the const_name_index item must be a valid index into the constant_pool
+	 * table.
+	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
+	 * representing the simple name of the enum constant represented by this element_value
+	 * structure.
+	 */
+	uint16_t valueIndex;
+
+public:
+	element_value_enum(element_value_type type, uint16_t typeIndex, uint16_t valueIndex,
+					   constant_pool &pool)
+		: element_value(type, pool), typeIndex(typeIndex), valueIndex(valueIndex)
+	{
+		// TODO: verify consistency
+	}
+	uint16_t getValueIndex()
+	{
+		return valueIndex;
+	}
+	uint16_t getTypeIndex()
+	{
+		return typeIndex;
+	}
+	virtual std::string toString()
+	{
+		return "enum value";
+	}
+	;
+};
+
+class element_value_class : public element_value
+{
+protected:
+	/**
+	 * The class_info_index item must be a valid index into the constant_pool table.
+	 * The constant_pool entry at that index must be a CONSTANT_Utf8_info (§4.4.7) structure
+	 * representing the return descriptor (§4.3.3) of the type that is reified by the class
+	 * represented by this element_value structure.
+	 *
+	 * For example, 'V' for Void.class, 'Ljava/lang/Object;' for Object, etc.
+	 *
+	 * Or in plain english, you can store type information in annotations. Yay.
+	 */
+	uint16_t classIndex;
+
+public:
+	element_value_class(element_value_type type, uint16_t classIndex, constant_pool &pool)
+		: element_value(type, pool), classIndex(classIndex)
+	{
+		// TODO: verify consistency
+	}
+	uint16_t getIndex()
+	{
+		return classIndex;
+	}
+	virtual std::string toString()
+	{
+		return "class";
+	}
+	;
+};
+
+/// nested annotations... yay
+class element_value_annotation : public element_value
+{
+private:
+	annotation *nestedAnnotation;
+
+public:
+	element_value_annotation(element_value_type type, annotation *nestedAnnotation,
+							 constant_pool &pool)
+		: element_value(type, pool), nestedAnnotation(nestedAnnotation) {};
+	~element_value_annotation()
+	{
+		if (nestedAnnotation)
+		{
+			delete nestedAnnotation;
+			nestedAnnotation = nullptr;
+		}
+	}
+	virtual std::string toString()
+	{
+		return "nested annotation";
+	}
+	;
+};
+
+/// and arrays!
+class element_value_array : public element_value
+{
+public:
+	typedef std::vector<element_value *> elem_vec;
+
+protected:
+	elem_vec values;
+
+public:
+	element_value_array(element_value_type type, std::vector<element_value *> &values,
+						constant_pool &pool)
+		: element_value(type, pool), values(values) {};
+	~element_value_array()
+	{
+		for (unsigned i = 0; i < values.size(); i++)
+		{
+			delete values[i];
+		}
+	}
+	;
+	elem_vec::const_iterator begin()
+	{
+		return values.cbegin();
+	}
+	elem_vec::const_iterator end()
+	{
+		return values.cend();
+	}
+	virtual std::string toString()
+	{
+		return "array";
+	}
+	;
+};
+}
\ No newline at end of file
diff --git a/libraries/classparser/src/classfile.h b/libraries/classparser/src/classfile.h
new file mode 100644
index 00000000..a5e7ee50
--- /dev/null
+++ b/libraries/classparser/src/classfile.h
@@ -0,0 +1,156 @@
+#pragma once
+#include "membuffer.h"
+#include "constants.h"
+#include "annotations.h"
+#include <map>
+namespace java
+{
+/**
+ * Class representing a Java .class file
+ */
+class classfile : public util::membuffer
+{
+public:
+	classfile(char *data, std::size_t size) : membuffer(data, size)
+	{
+		valid = false;
+		is_synthetic = false;
+		read_be(magic);
+		if (magic != 0xCAFEBABE)
+			throw new classfile_exception();
+		read_be(minor_version);
+		read_be(major_version);
+		constants.load(*this);
+		read_be(access_flags);
+		read_be(this_class);
+		read_be(super_class);
+
+		// Interfaces
+		uint16_t iface_count = 0;
+		read_be(iface_count);
+		while (iface_count)
+		{
+			uint16_t iface;
+			read_be(iface);
+			interfaces.push_back(iface);
+			iface_count--;
+		}
+
+		// Fields
+		// read fields (and attributes from inside fields) (and possible inner classes. yay for
+		// recursion!)
+		// for now though, we will ignore all attributes
+		/*
+		 * field_info
+		 * {
+		 * 	u2 access_flags;
+		 * 	u2 name_index;
+		 * 	u2 descriptor_index;
+		 * 	u2 attributes_count;
+		 * 	attribute_info attributes[attributes_count];
+		 * }
+		 */
+		uint16_t field_count = 0;
+		read_be(field_count);
+		while (field_count)
+		{
+			// skip field stuff
+			skip(6);
+			// and skip field attributes
+			uint16_t attr_count = 0;
+			read_be(attr_count);
+			while (attr_count)
+			{
+				skip(2);
+				uint32_t attr_length = 0;
+				read_be(attr_length);
+				skip(attr_length);
+				attr_count--;
+			}
+			field_count--;
+		}
+
+		// class methods
+		/*
+		 * method_info
+		 * {
+		 * 	u2 access_flags;
+		 * 	u2 name_index;
+		 * 	u2 descriptor_index;
+		 * 	u2 attributes_count;
+		 * 	attribute_info attributes[attributes_count];
+		 * }
+		 */
+		uint16_t method_count = 0;
+		read_be(method_count);
+		while (method_count)
+		{
+			skip(6);
+			// and skip method attributes
+			uint16_t attr_count = 0;
+			read_be(attr_count);
+			while (attr_count)
+			{
+				skip(2);
+				uint32_t attr_length = 0;
+				read_be(attr_length);
+				skip(attr_length);
+				attr_count--;
+			}
+			method_count--;
+		}
+
+		// class attributes
+		// there are many kinds of attributes. this is just the generic wrapper structure.
+		// type is decided by attribute name. extensions to the standard are *possible*
+		// class annotations are one kind of a attribute (one per class)
+		/*
+		 * attribute_info
+		 * {
+		 * 	u2 attribute_name_index;
+		 * 	u4 attribute_length;
+		 * 	u1 info[attribute_length];
+		 * }
+		 */
+		uint16_t class_attr_count = 0;
+		read_be(class_attr_count);
+		while (class_attr_count)
+		{
+			uint16_t name_idx = 0;
+			read_be(name_idx);
+			uint32_t attr_length = 0;
+			read_be(attr_length);
+
+			auto name = constants[name_idx];
+			if (name.str_data == "RuntimeVisibleAnnotations")
+			{
+				uint16_t num_annotations = 0;
+				read_be(num_annotations);
+				while (num_annotations)
+				{
+					visible_class_annotations.push_back(annotation::read(*this, constants));
+					num_annotations--;
+				}
+			}
+			else
+				skip(attr_length);
+			class_attr_count--;
+		}
+		valid = true;
+	}
+	;
+	bool valid;
+	bool is_synthetic;
+	uint32_t magic;
+	uint16_t minor_version;
+	uint16_t major_version;
+	constant_pool constants;
+	uint16_t access_flags;
+	uint16_t this_class;
+	uint16_t super_class;
+	// interfaces this class implements ? must be. investigate.
+	std::vector<uint16_t> interfaces;
+	// FIXME: doesn't free up memory on delete
+	java::annotation_table visible_class_annotations;
+};
+}
\ No newline at end of file
diff --git a/libraries/classparser/src/constants.h b/libraries/classparser/src/constants.h
new file mode 100644
index 00000000..242b943e
--- /dev/null
+++ b/libraries/classparser/src/constants.h
@@ -0,0 +1,220 @@
+#pragma once
+#include "errors.h"
+#include <sstream>
+
+namespace java
+{
+class constant
+{
+public:
+	enum type_t : uint8_t
+	{
+		j_hole = 0, // HACK: this is a hole in the array, because java is crazy
+		j_string_data = 1,
+		j_int = 3,
+		j_float = 4,
+		j_long = 5,
+		j_double = 6,
+		j_class = 7,
+		j_string = 8,
+		j_fieldref = 9,
+		j_methodref = 10,
+		j_interface_methodref = 11,
+		j_nameandtype = 12
+	} type;
+
+	constant(util::membuffer &buf)
+	{
+		buf.read(type);
+		// invalid constant type!
+		if (type > j_nameandtype || type == (type_t)0 || type == (type_t)2)
+			throw new classfile_exception();
+
+		// load data depending on type
+		switch (type)
+		{
+		case j_float:
+		case j_int:
+			buf.read_be(int_data); // same as float data really
+			break;
+		case j_double:
+		case j_long:
+			buf.read_be(long_data); // same as double
+			break;
+		case j_class:
+			buf.read_be(ref_type.class_idx);
+			break;
+		case j_fieldref:
+		case j_methodref:
+		case j_interface_methodref:
+			buf.read_be(ref_type.class_idx);
+			buf.read_be(ref_type.name_and_type_idx);
+			break;
+		case j_string:
+			buf.read_be(index);
+			break;
+		case j_string_data:
+			// HACK HACK: for now, we call these UTF-8 and do no further processing.
+			// Later, we should do some decoding. It's really modified UTF-8
+			// * U+0000 is represented as 0xC0,0x80 invalid character
+			// * any single zero byte ends the string
+			// * characters above U+10000 are encoded like in CESU-8
+			buf.read_jstr(str_data);
+			break;
+		case j_nameandtype:
+			buf.read_be(name_and_type.name_index);
+			buf.read_be(name_and_type.descriptor_index);
+			break;
+		}
+	}
+
+	constant(int fake)
+	{
+		type = j_hole;
+	}
+
+	std::string toString()
+	{
+		std::ostringstream ss;
+		switch (type)
+		{
+		case j_hole:
+			ss << "Fake legacy entry";
+			break;
+		case j_float:
+			ss << "Float: " << float_data;
+			break;
+		case j_double:
+			ss << "Double: " << double_data;
+			break;
+		case j_int:
+			ss << "Int: " << int_data;
+			break;
+		case j_long:
+			ss << "Long: " << long_data;
+			break;
+		case j_string_data:
+			ss << "StrData: " << str_data;
+			break;
+		case j_string:
+			ss << "Str: " << index;
+			break;
+		case j_fieldref:
+			ss << "FieldRef: " << ref_type.class_idx << " " << ref_type.name_and_type_idx;
+			break;
+		case j_methodref:
+			ss << "MethodRef: " << ref_type.class_idx << " " << ref_type.name_and_type_idx;
+			break;
+		case j_interface_methodref:
+			ss << "IfMethodRef: " << ref_type.class_idx << " " << ref_type.name_and_type_idx;
+			break;
+		case j_class:
+			ss << "Class: " << ref_type.class_idx;
+			break;
+		case j_nameandtype:
+			ss << "NameAndType: " << name_and_type.name_index << " "
+			   << name_and_type.descriptor_index;
+			break;
+		}
+		return ss.str();
+	}
+
+	std::string str_data; /** String data in 'modified utf-8'.*/
+	// store everything here.
+	union
+	{
+		int32_t int_data;
+		int64_t long_data;
+		float float_data;
+		double double_data;
+		uint16_t index;
+		struct
+		{
+			/**
+			 * Class reference:
+			 *   an index within the constant pool to a UTF-8 string containing
+			 *   the fully qualified class name (in internal format)
+			 * Used for j_class, j_fieldref, j_methodref and j_interface_methodref
+			 */
+			uint16_t class_idx;
+			// used for j_fieldref, j_methodref and j_interface_methodref
+			uint16_t name_and_type_idx;
+		} ref_type;
+		struct
+		{
+			uint16_t name_index;
+			uint16_t descriptor_index;
+		} name_and_type;
+	};
+};
+
+/**
+ * A helper class that represents the custom container used in Java class file for storage of
+ * constants
+ */
+class constant_pool
+{
+public:
+	/**
+	 * Create a pool of constants
+	 */
+	constant_pool()
+	{
+	}
+	/**
+	 * Load a java constant pool
+	 */
+	void load(util::membuffer &buf)
+	{
+		uint16_t length = 0;
+		buf.read_be(length);
+		length--;
+		uint16_t index = 1;
+		const constant *last_constant = nullptr;
+		while (length)
+		{
+			const constant &cnst = constant(buf);
+			constants.push_back(cnst);
+			last_constant = &constants[constants.size() - 1];
+			if (last_constant->type == constant::j_double ||
+				last_constant->type == constant::j_long)
+			{
+				// push in a fake constant to preserve indexing
+				constants.push_back(constant(0));
+				length -= 2;
+				index += 2;
+			}
+			else
+			{
+				length--;
+				index++;
+			}
+		}
+	}
+	typedef std::vector<java::constant> container_type;
+	/**
+	 * Access constants based on jar file index numbers (index of the first element is 1)
+	 */
+	java::constant &operator[](std::size_t constant_index)
+	{
+		if (constant_index == 0 || constant_index > constants.size())
+		{
+			throw new classfile_exception();
+		}
+		return constants[constant_index - 1];
+	}
+	;
+	container_type::const_iterator begin() const
+	{
+		return constants.begin();
+	}
+	;
+	container_type::const_iterator end() const
+	{
+		return constants.end();
+	}
+
+private:
+	container_type constants;
+};
+}
diff --git a/libraries/classparser/src/errors.h b/libraries/classparser/src/errors.h
new file mode 100644
index 00000000..ddbbd828
--- /dev/null
+++ b/libraries/classparser/src/errors.h
@@ -0,0 +1,8 @@
+#pragma once
+#include <exception>
+namespace java
+{
+class classfile_exception : public std::exception
+{
+};
+}
diff --git a/libraries/classparser/src/javaendian.h b/libraries/classparser/src/javaendian.h
new file mode 100644
index 00000000..d488b382
--- /dev/null
+++ b/libraries/classparser/src/javaendian.h
@@ -0,0 +1,76 @@
+#pragma once
+#include <stdint.h>
+
+/**
+ * Swap bytes between big endian and local number representation
+ */
+namespace util
+{
+#ifdef MULTIMC_BIG_ENDIAN
+inline uint64_t bigswap(uint64_t x)
+{
+	return x;
+}
+;
+inline uint32_t bigswap(uint32_t x)
+{
+	return x;
+}
+;
+inline uint16_t bigswap(uint16_t x)
+{
+	return x;
+}
+;
+inline int64_t bigswap(int64_t x)
+{
+	return x;
+}
+;
+inline int32_t bigswap(int32_t x)
+{
+	return x;
+}
+;
+inline int16_t bigswap(int16_t x)
+{
+	return x;
+}
+;
+#else
+inline uint64_t bigswap(uint64_t x)
+{
+	return (x >> 56) | ((x << 40) & 0x00FF000000000000) | ((x << 24) & 0x0000FF0000000000) |
+		   ((x << 8) & 0x000000FF00000000) | ((x >> 8) & 0x00000000FF000000) |
+		   ((x >> 24) & 0x0000000000FF0000) | ((x >> 40) & 0x000000000000FF00) | (x << 56);
+}
+;
+inline uint32_t bigswap(uint32_t x)
+{
+	return (x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24);
+}
+;
+inline uint16_t bigswap(uint16_t x)
+{
+	return (x >> 8) | (x << 8);
+}
+;
+inline int64_t bigswap(int64_t x)
+{
+	return (x >> 56) | ((x << 40) & 0x00FF000000000000) | ((x << 24) & 0x0000FF0000000000) |
+		   ((x << 8) & 0x000000FF00000000) | ((x >> 8) & 0x00000000FF000000) |
+		   ((x >> 24) & 0x0000000000FF0000) | ((x >> 40) & 0x000000000000FF00) | (x << 56);
+}
+;
+inline int32_t bigswap(int32_t x)
+{
+	return (x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24);
+}
+;
+inline int16_t bigswap(int16_t x)
+{
+	return (x >> 8) | (x << 8);
+}
+;
+#endif
+}
diff --git a/libraries/classparser/src/javautils.cpp b/libraries/classparser/src/javautils.cpp
new file mode 100644
index 00000000..f9310e5f
--- /dev/null
+++ b/libraries/classparser/src/javautils.cpp
@@ -0,0 +1,83 @@
+/* Copyright 2013-2015 MultiMC Contributors
+ *
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "classfile.h"
+#include "javautils.h"
+
+#include <QFile>
+#include <quazipfile.h>
+
+namespace javautils
+{
+
+QString GetMinecraftJarVersion(QString jarName)
+{
+	QString version = MCVer_Unknown;
+
+	// check if minecraft.jar exists
+	QFile jar(jarName);
+	if (!jar.exists())
+		return version;
+
+	// open minecraft.jar
+	QuaZip zip(&jar);
+	if (!zip.open(QuaZip::mdUnzip))
+		return version;
+
+	// open Minecraft.class
+	zip.setCurrentFile("net/minecraft/client/Minecraft.class", QuaZip::csSensitive);
+	QuaZipFile Minecraft(&zip);
+	if (!Minecraft.open(QuaZipFile::ReadOnly))
+		return version;
+
+	// read Minecraft.class
+	qint64 size = Minecraft.size();
+	char *classfile = new char[size];
+	Minecraft.read(classfile, size);
+
+	// parse Minecraft.class
+	try
+	{
+		char *temp = classfile;
+		java::classfile MinecraftClass(temp, size);
+		java::constant_pool constants = MinecraftClass.constants;
+		for (java::constant_pool::container_type::const_iterator iter = constants.begin();
+			 iter != constants.end(); iter++)
+		{
+			const java::constant &constant = *iter;
+			if (constant.type != java::constant::j_string_data)
+				continue;
+			const std::string &str = constant.str_data;
+			if (str.compare(0, 20, "Minecraft Minecraft ") == 0)
+			{
+				version = str.substr(20).data();
+				break;
+			}
+		}
+	}
+	catch (java::classfile_exception &)
+	{
+	}
+
+	// clean up
+	delete[] classfile;
+	Minecraft.close();
+	zip.close();
+	jar.close();
+
+	return version;
+}
+}
diff --git a/libraries/classparser/src/membuffer.h b/libraries/classparser/src/membuffer.h
new file mode 100644
index 00000000..ab83412a
--- /dev/null
+++ b/libraries/classparser/src/membuffer.h
@@ -0,0 +1,63 @@
+#pragma once
+#include <stdint.h>
+#include <string>
+#include <vector>
+#include <exception>
+#include "javaendian.h"
+
+namespace util
+{
+class membuffer
+{
+public:
+	membuffer(char *buffer, std::size_t size)
+	{
+		current = start = buffer;
+		end = start + size;
+	}
+	~membuffer()
+	{
+		// maybe? possibly? left out to avoid confusion. for now.
+		// delete start;
+	}
+	/**
+		* Read some value. That's all ;)
+		*/
+	template <class T> void read(T &val)
+	{
+		val = *(T *)current;
+		current += sizeof(T);
+	}
+	/**
+		* Read a big-endian number
+		* valid for 2-byte, 4-byte and 8-byte variables
+		*/
+	template <class T> void read_be(T &val)
+	{
+		val = util::bigswap(*(T *)current);
+		current += sizeof(T);
+	}
+	/**
+		* Read a string in the format:
+		* 2B length (big endian, unsigned)
+		* length bytes data
+		*/
+	void read_jstr(std::string &str)
+	{
+		uint16_t length = 0;
+		read_be(length);
+		str.append(current, length);
+		current += length;
+	}
+	/**
+		* Skip N bytes
+		*/
+	void skip(std::size_t N)
+	{
+		current += N;
+	}
+
+private:
+	char *start, *end, *current;
+};
+}
diff --git a/libraries/gui/CMakeLists.txt b/libraries/gui/CMakeLists.txt
deleted file mode 100644
index 1551a927..00000000
--- a/libraries/gui/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-project(MultiMC_logic)
-
-set(GUI_SOURCES
-	DesktopServices.h
-	DesktopServices.cpp
-
-	# Icons
-	icons/MMCIcon.h
-	icons/MMCIcon.cpp
-	icons/IconList.h
-	icons/IconList.cpp
-
-	SkinUtils.cpp
-	SkinUtils.h
-)
-################################ COMPILE ################################
-
-add_library(MultiMC_gui SHARED ${GUI_SOURCES})
-set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
-
-generate_export_header(MultiMC_gui)
-
-# Link
-target_link_libraries(MultiMC_gui iconfix MultiMC_logic)
-qt5_use_modules(MultiMC_gui Gui)
-
-# Mark and export headers
-target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
diff --git a/libraries/gui/DesktopServices.cpp b/libraries/gui/DesktopServices.cpp
deleted file mode 100644
index 3154ea01..00000000
--- a/libraries/gui/DesktopServices.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "DesktopServices.h"
-#include <QDir>
-#include <QDesktopServices>
-#include <QProcess>
-#include <QDebug>
-
-/**
- * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
- */
-#if defined(Q_OS_LINUX)
-
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-template <typename T>
-bool IndirectOpen(T callable, qint64 *pid_forked = nullptr)
-{
-	auto pid = fork();
-	if(pid_forked)
-	{
-		if(pid > 0)
-			*pid_forked = pid;
-		else
-			*pid_forked = 0;
-	}
-	if(pid == -1)
-	{
-		qWarning() << "IndirectOpen failed to fork: " << errno;
-		return false;
-	}
-	// child - do the stuff
-	if(pid == 0)
-	{
-		// unset all this garbage so it doesn't get passed to the child process
-		qunsetenv("LD_PRELOAD");
-		qunsetenv("LD_LIBRARY_PATH");
-		qunsetenv("LD_DEBUG");
-		qunsetenv("QT_PLUGIN_PATH");
-		qunsetenv("QT_FONTPATH");
-
-		// open the URL
-		auto status = callable();
-
-		// detach from the parent process group.
-		setsid();
-
-		// die. now. do not clean up anything, it would just hang forever.
-		_exit(status ? 0 : 1);
-	}
-	else
-	{
-		//parent - assume it worked.
-		int status;
-		while (waitpid(pid, &status, 0))
-		{
-			if(WIFEXITED(status))
-			{
-				return WEXITSTATUS(status) == 0;
-			}
-			if(WIFSIGNALED(status))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-}
-#endif
-
-namespace DesktopServices {
-bool openDirectory(const QString &path, bool ensureExists)
-{
-	qDebug() << "Opening directory" << path;
-	QDir parentPath;
-	QDir dir(path);
-	if (!dir.exists())
-	{
-		parentPath.mkpath(dir.absolutePath());
-	}
-	auto f = [&]()
-	{
-		return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath()));
-	};
-#if defined(Q_OS_LINUX)
-	return IndirectOpen(f);
-#else
-	return f();
-#endif
-}
-
-bool openFile(const QString &path)
-{
-	qDebug() << "Opening file" << path;
-	auto f = [&]()
-	{
-		return QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-	};
-#if defined(Q_OS_LINUX)
-	return IndirectOpen(f);
-#else
-	return f();
-#endif
-}
-
-bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid)
-{
-	qDebug() << "Opening file" << path << "using" << application;
-#if defined(Q_OS_LINUX)
-	// FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-	return IndirectOpen([&]()
-	{
-		return QProcess::startDetached(application, QStringList() << path, workingDirectory);
-	}, pid);
-#else
-	return QProcess::startDetached(application, QStringList() << path, workingDirectory, pid);
-#endif
-}
-
-bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid)
-{
-	qDebug() << "Running" << application << "with args" << args.join(' ');
-#if defined(Q_OS_LINUX)
-	// FIXME: the pid here is fake. So if something depends on it, it will likely misbehave
-	return IndirectOpen([&]()
-	{
-		return QProcess::startDetached(application, args, workingDirectory);
-	}, pid);
-#else
-	return QProcess::startDetached(application, args, workingDirectory, pid);
-#endif
-}
-
-bool openUrl(const QUrl &url)
-{
-	qDebug() << "Opening URL" << url.toString();
-	auto f = [&]()
-	{
-		return QDesktopServices::openUrl(url);
-	};
-#if defined(Q_OS_LINUX)
-	return IndirectOpen(f);
-#else
-	return f();
-#endif
-}
-
-}
diff --git a/libraries/gui/DesktopServices.h b/libraries/gui/DesktopServices.h
deleted file mode 100644
index 9daf192a..00000000
--- a/libraries/gui/DesktopServices.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <QUrl>
-#include <QString>
-#include "multimc_gui_export.h"
-
-/**
- * This wraps around QDesktopServices and adds workarounds where needed
- * Use this instead of QDesktopServices!
- */
-namespace DesktopServices
-{
-	/**
-	 * Open a file in whatever application is applicable
-	 */
-	MULTIMC_GUI_EXPORT bool openFile(const QString &path);
-
-	/**
-	 * Open a file in the specified application
-	 */
-	MULTIMC_GUI_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-	/**
-	 * Run an application
-	 */
-	MULTIMC_GUI_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-	/**
-	 * Open a directory
-	 */
-	MULTIMC_GUI_EXPORT bool openDirectory(const QString &path, bool ensureExists = false);
-
-	/**
-	 * Open the URL, most likely in a browser. Maybe.
-	 */
-	MULTIMC_GUI_EXPORT bool openUrl(const QUrl &url);
-};
diff --git a/libraries/gui/SkinUtils.cpp b/libraries/gui/SkinUtils.cpp
deleted file mode 100644
index f69a1071..00000000
--- a/libraries/gui/SkinUtils.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SkinUtils.h"
-#include "net/HttpMetaCache.h"
-#include "Env.h"
-
-#include <QFile>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-
-namespace SkinUtils
-{
-/*
- * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise
- */
-QPixmap getFaceFromCache(QString username, int height, int width)
-{
-	QFile fskin(ENV.metacache()
-					->resolveEntry("skins", username + ".png")
-					->getFullPath());
-
-	if (fskin.exists())
-	{
-		QPixmap skin(fskin.fileName());
-		if(!skin.isNull())
-		{
-			return skin.copy(8, 8, 8, 8).scaled(height, width, Qt::KeepAspectRatio);
-		}
-	}
-
-	return QPixmap();
-}
-}
diff --git a/libraries/gui/icons/IconList.cpp b/libraries/gui/icons/IconList.cpp
deleted file mode 100644
index 99def3b7..00000000
--- a/libraries/gui/icons/IconList.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "IconList.h"
-#include <FileSystem.h>
-#include <QMap>
-#include <QEventLoop>
-#include <QMimeData>
-#include <QUrl>
-#include <QFileSystemWatcher>
-#include <QSet>
-#include <QDebug>
-
-#define MAX_SIZE 1024
-
-IconList::IconList(QString builtinPath, QString path, QObject *parent) : QAbstractListModel(parent)
-{
-	// add builtin icons
-	QDir instance_icons(builtinPath);
-	auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
-	for (auto file_info : file_info_list)
-	{
-		QString key = file_info.baseName();
-		addIcon(key, key, file_info.absoluteFilePath(), MMCIcon::Builtin);
-	}
-
-	m_watcher.reset(new QFileSystemWatcher());
-	is_watching = false;
-	connect(m_watcher.get(), SIGNAL(directoryChanged(QString)),
-			SLOT(directoryChanged(QString)));
-	connect(m_watcher.get(), SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString)));
-
-	directoryChanged(path);
-}
-
-void IconList::directoryChanged(const QString &path)
-{
-	QDir new_dir (path);
-	if(m_dir.absolutePath() != new_dir.absolutePath())
-	{
-		m_dir.setPath(path);
-		m_dir.refresh();
-		if(is_watching)
-			stopWatching();
-		startWatching();
-	}
-	if(!m_dir.exists())
-		if(!FS::ensureFolderPathExists(m_dir.absolutePath()))
-			return;
-	m_dir.refresh();
-	auto new_list = m_dir.entryList(QDir::Files, QDir::Name);
-	for (auto it = new_list.begin(); it != new_list.end(); it++)
-	{
-		QString &foo = (*it);
-		foo = m_dir.filePath(foo);
-	}
-	auto new_set = new_list.toSet();
-	QList<QString> current_list;
-	for (auto &it : icons)
-	{
-		if (!it.has(MMCIcon::FileBased))
-			continue;
-		current_list.push_back(it.m_images[MMCIcon::FileBased].filename);
-	}
-	QSet<QString> current_set = current_list.toSet();
-
-	QSet<QString> to_remove = current_set;
-	to_remove -= new_set;
-
-	QSet<QString> to_add = new_set;
-	to_add -= current_set;
-
-	for (auto remove : to_remove)
-	{
-		qDebug() << "Removing " << remove;
-		QFileInfo rmfile(remove);
-		QString key = rmfile.baseName();
-		int idx = getIconIndex(key);
-		if (idx == -1)
-			continue;
-		icons[idx].remove(MMCIcon::FileBased);
-		if (icons[idx].type() == MMCIcon::ToBeDeleted)
-		{
-			beginRemoveRows(QModelIndex(), idx, idx);
-			icons.remove(idx);
-			reindex();
-			endRemoveRows();
-		}
-		else
-		{
-			dataChanged(index(idx), index(idx));
-		}
-		m_watcher->removePath(remove);
-		emit iconUpdated(key);
-	}
-
-	for (auto add : to_add)
-	{
-		qDebug() << "Adding " << add;
-		QFileInfo addfile(add);
-		QString key = addfile.baseName();
-		if (addIcon(key, QString(), addfile.filePath(), MMCIcon::FileBased))
-		{
-			m_watcher->addPath(add);
-			emit iconUpdated(key);
-		}
-	}
-}
-
-void IconList::fileChanged(const QString &path)
-{
-	qDebug() << "Checking " << path;
-	QFileInfo checkfile(path);
-	if (!checkfile.exists())
-		return;
-	QString key = checkfile.baseName();
-	int idx = getIconIndex(key);
-	if (idx == -1)
-		return;
-	QIcon icon(path);
-	if (!icon.availableSizes().size())
-		return;
-
-	icons[idx].m_images[MMCIcon::FileBased].icon = icon;
-	dataChanged(index(idx), index(idx));
-	emit iconUpdated(key);
-}
-
-void IconList::SettingChanged(const Setting &setting, QVariant value)
-{
-	if(setting.id() != "IconsDir")
-		return;
-
-	directoryChanged(value.toString());
-}
-
-void IconList::startWatching()
-{
-	auto abs_path = m_dir.absolutePath();
-	FS::ensureFolderPathExists(abs_path);
-	is_watching = m_watcher->addPath(abs_path);
-	if (is_watching)
-	{
-		qDebug() << "Started watching " << abs_path;
-	}
-	else
-	{
-		qDebug() << "Failed to start watching " << abs_path;
-	}
-}
-
-void IconList::stopWatching()
-{
-	m_watcher->removePaths(m_watcher->files());
-	m_watcher->removePaths(m_watcher->directories());
-	is_watching = false;
-}
-
-QStringList IconList::mimeTypes() const
-{
-	QStringList types;
-	types << "text/uri-list";
-	return types;
-}
-Qt::DropActions IconList::supportedDropActions() const
-{
-	return Qt::CopyAction;
-}
-
-bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-							const QModelIndex &parent)
-{
-	if (action == Qt::IgnoreAction)
-		return true;
-	// check if the action is supported
-	if (!data || !(action & supportedDropActions()))
-		return false;
-
-	// files dropped from outside?
-	if (data->hasUrls())
-	{
-		auto urls = data->urls();
-		QStringList iconFiles;
-		for (auto url : urls)
-		{
-			// only local files may be dropped...
-			if (!url.isLocalFile())
-				continue;
-			iconFiles += url.toLocalFile();
-		}
-		installIcons(iconFiles);
-		return true;
-	}
-	return false;
-}
-
-Qt::ItemFlags IconList::flags(const QModelIndex &index) const
-{
-	Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
-	if (index.isValid())
-		return Qt::ItemIsDropEnabled | defaultFlags;
-	else
-		return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-QVariant IconList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	int row = index.row();
-
-	if (row < 0 || row >= icons.size())
-		return QVariant();
-
-	switch (role)
-	{
-	case Qt::DecorationRole:
-		return icons[row].icon();
-	case Qt::DisplayRole:
-		return icons[row].name();
-	case Qt::UserRole:
-		return icons[row].m_key;
-	default:
-		return QVariant();
-	}
-}
-
-int IconList::rowCount(const QModelIndex &parent) const
-{
-	return icons.size();
-}
-
-void IconList::installIcons(QStringList iconFiles)
-{
-	for (QString file : iconFiles)
-	{
-		QFileInfo fileinfo(file);
-		if (!fileinfo.isReadable() || !fileinfo.isFile())
-			continue;
-		QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName());
-
-		QString suffix = fileinfo.suffix();
-		if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
-			continue;
-
-		if (!QFile::copy(file, target))
-			continue;
-	}
-}
-
-bool IconList::iconFileExists(QString key)
-{
-	auto iconEntry = icon(key);
-	if(!iconEntry)
-	{
-		return false;
-	}
-	return iconEntry->has(MMCIcon::FileBased);
-}
-
-const MMCIcon *IconList::icon(QString key)
-{
-	int iconIdx = getIconIndex(key);
-	if (iconIdx == -1)
-		return nullptr;
-	return &icons[iconIdx];
-}
-
-bool IconList::deleteIcon(QString key)
-{
-	int iconIdx = getIconIndex(key);
-	if (iconIdx == -1)
-		return false;
-	auto &iconEntry = icons[iconIdx];
-	if (iconEntry.has(MMCIcon::FileBased))
-	{
-		return QFile::remove(iconEntry.m_images[MMCIcon::FileBased].filename);
-	}
-	return false;
-}
-
-bool IconList::addIcon(QString key, QString name, QString path, MMCIcon::Type type)
-{
-	// replace the icon even? is the input valid?
-	QIcon icon(path);
-	if (!icon.availableSizes().size())
-		return false;
-	auto iter = name_index.find(key);
-	if (iter != name_index.end())
-	{
-		auto &oldOne = icons[*iter];
-		oldOne.replace(type, icon, path);
-		dataChanged(index(*iter), index(*iter));
-		return true;
-	}
-	else
-	{
-		// add a new icon
-		beginInsertRows(QModelIndex(), icons.size(), icons.size());
-		{
-			MMCIcon mmc_icon;
-			mmc_icon.m_name = name;
-			mmc_icon.m_key = key;
-			mmc_icon.replace(type, icon, path);
-			icons.push_back(mmc_icon);
-			name_index[key] = icons.size() - 1;
-		}
-		endInsertRows();
-		return true;
-	}
-}
-
-void IconList::reindex()
-{
-	name_index.clear();
-	int i = 0;
-	for (auto &iter : icons)
-	{
-		name_index[iter.m_key] = i;
-		i++;
-	}
-}
-
-QIcon IconList::getIcon(QString key)
-{
-	int icon_index = getIconIndex(key);
-
-	if (icon_index != -1)
-		return icons[icon_index].icon();
-
-	// Fallback for icons that don't exist.
-	icon_index = getIconIndex("infinity");
-
-	if (icon_index != -1)
-		return icons[icon_index].icon();
-	return QIcon();
-}
-
-QIcon IconList::getBigIcon(QString key)
-{
-	int icon_index = getIconIndex(key);
-
-	if (icon_index == -1)
-		key = "infinity";
-
-	// Fallback for icons that don't exist.
-	icon_index = getIconIndex(key);
-
-	if (icon_index == -1)
-		return QIcon();
-
-	QPixmap bigone = icons[icon_index].icon().pixmap(256,256).scaled(256,256);
-	return QIcon(bigone);
-}
-
-int IconList::getIconIndex(QString key)
-{
-	if (key == "default")
-		key = "infinity";
-
-	auto iter = name_index.find(key);
-	if (iter != name_index.end())
-		return *iter;
-
-	return -1;
-}
-
-//#include "IconList.moc"
diff --git a/libraries/gui/icons/IconList.h b/libraries/gui/icons/IconList.h
deleted file mode 100644
index 971db824..00000000
--- a/libraries/gui/icons/IconList.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QMutex>
-#include <QAbstractListModel>
-#include <QFile>
-#include <QDir>
-#include <QtGui/QIcon>
-#include <memory>
-#include "MMCIcon.h"
-#include "settings/Setting.h"
-#include "Env.h" // there is a global icon list inside Env.
-
-#include "multimc_logic_export.h"
-
-class QFileSystemWatcher;
-
-class MULTIMC_LOGIC_EXPORT IconList : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	explicit IconList(QString builtinPath, QString path, QObject *parent = 0);
-	virtual ~IconList() {};
-
-	QIcon getIcon(QString key);
-	QIcon getBigIcon(QString key);
-	int getIconIndex(QString key);
-
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-	bool addIcon(QString key, QString name, QString path, MMCIcon::Type type);
-	bool deleteIcon(QString key);
-	bool iconFileExists(QString key);
-
-	virtual QStringList mimeTypes() const;
-	virtual Qt::DropActions supportedDropActions() const;
-	virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-							  const QModelIndex &parent);
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-
-	void installIcons(QStringList iconFiles);
-
-	const MMCIcon * icon(QString key);
-
-	void startWatching();
-	void stopWatching();
-
-signals:
-	void iconUpdated(QString key);
-
-private:
-	// hide copy constructor
-	IconList(const IconList &) = delete;
-	// hide assign op
-	IconList &operator=(const IconList &) = delete;
-	void reindex();
-
-public slots:
-	void directoryChanged(const QString &path);
-
-protected slots:
-	void fileChanged(const QString &path);
-	void SettingChanged(const Setting & setting, QVariant value);
-private:
-	std::shared_ptr<QFileSystemWatcher> m_watcher;
-	bool is_watching;
-	QMap<QString, int> name_index;
-	QVector<MMCIcon> icons;
-	QDir m_dir;
-};
diff --git a/libraries/gui/icons/MMCIcon.cpp b/libraries/gui/icons/MMCIcon.cpp
deleted file mode 100644
index 6b4eef39..00000000
--- a/libraries/gui/icons/MMCIcon.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MMCIcon.h"
-#include <QFileInfo>
-
-MMCIcon::Type operator--(MMCIcon::Type &t, int)
-{
-	MMCIcon::Type temp = t;
-	switch (t)
-	{
-	case MMCIcon::Type::Builtin:
-		t = MMCIcon::Type::ToBeDeleted;
-		break;
-	case MMCIcon::Type::Transient:
-		t = MMCIcon::Type::Builtin;
-		break;
-	case MMCIcon::Type::FileBased:
-		t = MMCIcon::Type::Transient;
-		break;
-	default:
-	{
-	}
-	}
-	return temp;
-}
-
-MMCIcon::Type MMCIcon::type() const
-{
-	return m_current_type;
-}
-
-QString MMCIcon::name() const
-{
-	if (m_name.size())
-		return m_name;
-	return m_key;
-}
-
-bool MMCIcon::has(MMCIcon::Type _type) const
-{
-	return m_images[_type].present();
-}
-
-QIcon MMCIcon::icon() const
-{
-	if (m_current_type == Type::ToBeDeleted)
-		return QIcon();
-	return m_images[m_current_type].icon;
-}
-
-void MMCIcon::remove(Type rm_type)
-{
-	m_images[rm_type].filename = QString();
-	m_images[rm_type].icon = QIcon();
-	for (auto iter = rm_type; iter != Type::ToBeDeleted; iter--)
-	{
-		if (m_images[iter].present())
-		{
-			m_current_type = iter;
-			return;
-		}
-	}
-	m_current_type = Type::ToBeDeleted;
-}
-
-void MMCIcon::replace(MMCIcon::Type new_type, QIcon icon, QString path)
-{
-	QFileInfo foo(path);
-	if (new_type > m_current_type || m_current_type == MMCIcon::ToBeDeleted)
-	{
-		m_current_type = new_type;
-	}
-	m_images[new_type].icon = icon;
-	m_images[new_type].changed = foo.lastModified();
-	m_images[new_type].filename = path;
-}
diff --git a/libraries/gui/icons/MMCIcon.h b/libraries/gui/icons/MMCIcon.h
deleted file mode 100644
index 6f9617c2..00000000
--- a/libraries/gui/icons/MMCIcon.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QString>
-#include <QDateTime>
-#include <QIcon>
-
-#include "multimc_gui_export.h"
-
-struct MULTIMC_GUI_EXPORT MMCImage
-{
-	QIcon icon;
-	QString filename;
-	QDateTime changed;
-	bool present() const
-	{
-		return !icon.isNull();
-	}
-};
-
-struct MULTIMC_GUI_EXPORT MMCIcon
-{
-	enum Type : unsigned
-	{
-		Builtin,
-		Transient,
-		FileBased,
-		ICONS_TOTAL,
-		ToBeDeleted
-	};
-	QString m_key;
-	QString m_name;
-	MMCImage m_images[ICONS_TOTAL];
-	Type m_current_type = ToBeDeleted;
-
-	Type type() const;
-	QString name() const;
-	bool has(Type _type) const;
-	QIcon icon() const;
-	void remove(Type rm_type);
-	void replace(Type new_type, QIcon icon, QString path = QString());
-};
diff --git a/libraries/hoedown/CMakeLists.txt b/libraries/hoedown/CMakeLists.txt
new file mode 100644
index 00000000..7902e734
--- /dev/null
+++ b/libraries/hoedown/CMakeLists.txt
@@ -0,0 +1,26 @@
+# hoedown 3.0.2 - https://github.com/hoedown/hoedown/archive/3.0.2.tar.gz
+project(hoedown LANGUAGES C VERSION 3.0.2)
+
+set(HOEDOWN_SOURCES
+include/hoedown/autolink.h
+include/hoedown/buffer.h
+include/hoedown/document.h
+include/hoedown/escape.h
+include/hoedown/html.h
+include/hoedown/stack.h
+include/hoedown/version.h
+src/autolink.c
+src/buffer.c
+src/document.c
+src/escape.c
+src/html.c
+src/html_blocks.c
+src/html_smartypants.c
+src/stack.c
+src/version.c
+)
+
+# Include self.
+add_library(hoedown STATIC ${HOEDOWN_SOURCES})
+
+target_include_directories(hoedown PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/libraries/hoedown/LICENSE b/libraries/hoedown/LICENSE
new file mode 100644
index 00000000..4e75de4d
--- /dev/null
+++ b/libraries/hoedown/LICENSE
@@ -0,0 +1,15 @@
+Copyright (c) 2008, Natacha Porté
+Copyright (c) 2011, Vicent Martí
+Copyright (c) 2014, Xavier Mendez, Devin Torres and the Hoedown authors
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/libraries/hoedown/README.md b/libraries/hoedown/README.md
new file mode 100644
index 00000000..abe2b6ca
--- /dev/null
+++ b/libraries/hoedown/README.md
@@ -0,0 +1,9 @@
+Hoedown
+=======
+
+This is Hoedown 3.0.2, taken from [the hoedown github repo](https://github.com/hoedown/hoedown).
+
+`Hoedown` is a revived fork of [Sundown](https://github.com/vmg/sundown),
+the Markdown parser based on the original code of the
+[Upskirt library](http://fossil.instinctive.eu/libupskirt/index)
+by Natacha Porté.
diff --git a/libraries/hoedown/include/hoedown/autolink.h b/libraries/hoedown/include/hoedown/autolink.h
new file mode 100644
index 00000000..528885c9
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/autolink.h
@@ -0,0 +1,46 @@
+/* autolink.h - versatile autolinker */
+
+#ifndef HOEDOWN_AUTOLINK_H
+#define HOEDOWN_AUTOLINK_H
+
+#include "buffer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************
+ * CONSTANTS *
+ *************/
+
+typedef enum hoedown_autolink_flags {
+	HOEDOWN_AUTOLINK_SHORT_DOMAINS = (1 << 0)
+} hoedown_autolink_flags;
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_autolink_is_safe: verify that a URL has a safe protocol */
+int hoedown_autolink_is_safe(const uint8_t *data, size_t size);
+
+/* hoedown_autolink__www: search for the next www link in data */
+size_t hoedown_autolink__www(size_t *rewind_p, hoedown_buffer *link,
+	uint8_t *data, size_t offset, size_t size, hoedown_autolink_flags flags);
+
+/* hoedown_autolink__email: search for the next email in data */
+size_t hoedown_autolink__email(size_t *rewind_p, hoedown_buffer *link,
+	uint8_t *data, size_t offset, size_t size, hoedown_autolink_flags flags);
+
+/* hoedown_autolink__url: search for the next URL in data */
+size_t hoedown_autolink__url(size_t *rewind_p, hoedown_buffer *link,
+	uint8_t *data, size_t offset, size_t size, hoedown_autolink_flags flags);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_AUTOLINK_H **/
diff --git a/libraries/hoedown/include/hoedown/buffer.h b/libraries/hoedown/include/hoedown/buffer.h
new file mode 100644
index 00000000..d7703f8d
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/buffer.h
@@ -0,0 +1,134 @@
+/* buffer.h - simple, fast buffers */
+
+#ifndef HOEDOWN_BUFFER_H
+#define HOEDOWN_BUFFER_H
+
+#include <stdio.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_MSC_VER)
+#define __attribute__(x)
+#define inline __inline
+#define __builtin_expect(x,n) x
+#endif
+
+
+/*********
+ * TYPES *
+ *********/
+
+typedef void *(*hoedown_realloc_callback)(void *, size_t);
+typedef void (*hoedown_free_callback)(void *);
+
+struct hoedown_buffer {
+	uint8_t *data;	/* actual character data */
+	size_t size;	/* size of the string */
+	size_t asize;	/* allocated size (0 = volatile buffer) */
+	size_t unit;	/* reallocation unit size (0 = read-only buffer) */
+
+	hoedown_realloc_callback data_realloc;
+	hoedown_free_callback data_free;
+	hoedown_free_callback buffer_free;
+};
+
+typedef struct hoedown_buffer hoedown_buffer;
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* allocation wrappers */
+void *hoedown_malloc(size_t size) __attribute__ ((malloc));
+void *hoedown_calloc(size_t nmemb, size_t size) __attribute__ ((malloc));
+void *hoedown_realloc(void *ptr, size_t size) __attribute__ ((malloc));
+
+/* hoedown_buffer_init: initialize a buffer with custom allocators */
+void hoedown_buffer_init(
+	hoedown_buffer *buffer,
+	size_t unit,
+	hoedown_realloc_callback data_realloc,
+	hoedown_free_callback data_free,
+	hoedown_free_callback buffer_free
+);
+
+/* hoedown_buffer_uninit: uninitialize an existing buffer */
+void hoedown_buffer_uninit(hoedown_buffer *buf);
+
+/* hoedown_buffer_new: allocate a new buffer */
+hoedown_buffer *hoedown_buffer_new(size_t unit) __attribute__ ((malloc));
+
+/* hoedown_buffer_reset: free internal data of the buffer */
+void hoedown_buffer_reset(hoedown_buffer *buf);
+
+/* hoedown_buffer_grow: increase the allocated size to the given value */
+void hoedown_buffer_grow(hoedown_buffer *buf, size_t neosz);
+
+/* hoedown_buffer_put: append raw data to a buffer */
+void hoedown_buffer_put(hoedown_buffer *buf, const uint8_t *data, size_t size);
+
+/* hoedown_buffer_puts: append a NUL-terminated string to a buffer */
+void hoedown_buffer_puts(hoedown_buffer *buf, const char *str);
+
+/* hoedown_buffer_putc: append a single char to a buffer */
+void hoedown_buffer_putc(hoedown_buffer *buf, uint8_t c);
+
+/* hoedown_buffer_putf: read from a file and append to a buffer, until EOF or error */
+int hoedown_buffer_putf(hoedown_buffer *buf, FILE* file);
+
+/* hoedown_buffer_set: replace the buffer's contents with raw data */
+void hoedown_buffer_set(hoedown_buffer *buf, const uint8_t *data, size_t size);
+
+/* hoedown_buffer_sets: replace the buffer's contents with a NUL-terminated string */
+void hoedown_buffer_sets(hoedown_buffer *buf, const char *str);
+
+/* hoedown_buffer_eq: compare a buffer's data with other data for equality */
+int hoedown_buffer_eq(const hoedown_buffer *buf, const uint8_t *data, size_t size);
+
+/* hoedown_buffer_eq: compare a buffer's data with NUL-terminated string for equality */
+int hoedown_buffer_eqs(const hoedown_buffer *buf, const char *str);
+
+/* hoedown_buffer_prefix: compare the beginning of a buffer with a string */
+int hoedown_buffer_prefix(const hoedown_buffer *buf, const char *prefix);
+
+/* hoedown_buffer_slurp: remove a given number of bytes from the head of the buffer */
+void hoedown_buffer_slurp(hoedown_buffer *buf, size_t size);
+
+/* hoedown_buffer_cstr: NUL-termination of the string array (making a C-string) */
+const char *hoedown_buffer_cstr(hoedown_buffer *buf);
+
+/* hoedown_buffer_printf: formatted printing to a buffer */
+void hoedown_buffer_printf(hoedown_buffer *buf, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+
+/* hoedown_buffer_put_utf8: put a Unicode character encoded as UTF-8 */
+void hoedown_buffer_put_utf8(hoedown_buffer *buf, unsigned int codepoint);
+
+/* hoedown_buffer_free: free the buffer */
+void hoedown_buffer_free(hoedown_buffer *buf);
+
+
+/* HOEDOWN_BUFPUTSL: optimized hoedown_buffer_puts of a string literal */
+#define HOEDOWN_BUFPUTSL(output, literal) \
+	hoedown_buffer_put(output, (const uint8_t *)literal, sizeof(literal) - 1)
+
+/* HOEDOWN_BUFSETSL: optimized hoedown_buffer_sets of a string literal */
+#define HOEDOWN_BUFSETSL(output, literal) \
+	hoedown_buffer_set(output, (const uint8_t *)literal, sizeof(literal) - 1)
+
+/* HOEDOWN_BUFEQSL: optimized hoedown_buffer_eqs of a string literal */
+#define HOEDOWN_BUFEQSL(output, literal) \
+	hoedown_buffer_eq(output, (const uint8_t *)literal, sizeof(literal) - 1)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_BUFFER_H **/
diff --git a/libraries/hoedown/include/hoedown/document.h b/libraries/hoedown/include/hoedown/document.h
new file mode 100644
index 00000000..a8178fec
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/document.h
@@ -0,0 +1,172 @@
+/* document.h - generic markdown parser */
+
+#ifndef HOEDOWN_DOCUMENT_H
+#define HOEDOWN_DOCUMENT_H
+
+#include "buffer.h"
+#include "autolink.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************
+ * CONSTANTS *
+ *************/
+
+typedef enum hoedown_extensions {
+	/* block-level extensions */
+	HOEDOWN_EXT_TABLES = (1 << 0),
+	HOEDOWN_EXT_FENCED_CODE = (1 << 1),
+	HOEDOWN_EXT_FOOTNOTES = (1 << 2),
+
+	/* span-level extensions */
+	HOEDOWN_EXT_AUTOLINK = (1 << 3),
+	HOEDOWN_EXT_STRIKETHROUGH = (1 << 4),
+	HOEDOWN_EXT_UNDERLINE = (1 << 5),
+	HOEDOWN_EXT_HIGHLIGHT = (1 << 6),
+	HOEDOWN_EXT_QUOTE = (1 << 7),
+	HOEDOWN_EXT_SUPERSCRIPT = (1 << 8),
+	HOEDOWN_EXT_MATH = (1 << 9),
+
+	/* other flags */
+	HOEDOWN_EXT_NO_INTRA_EMPHASIS = (1 << 11),
+	HOEDOWN_EXT_SPACE_HEADERS = (1 << 12),
+	HOEDOWN_EXT_MATH_EXPLICIT = (1 << 13),
+
+	/* negative flags */
+	HOEDOWN_EXT_DISABLE_INDENTED_CODE = (1 << 14)
+} hoedown_extensions;
+
+#define HOEDOWN_EXT_BLOCK (\
+	HOEDOWN_EXT_TABLES |\
+	HOEDOWN_EXT_FENCED_CODE |\
+	HOEDOWN_EXT_FOOTNOTES )
+
+#define HOEDOWN_EXT_SPAN (\
+	HOEDOWN_EXT_AUTOLINK |\
+	HOEDOWN_EXT_STRIKETHROUGH |\
+	HOEDOWN_EXT_UNDERLINE |\
+	HOEDOWN_EXT_HIGHLIGHT |\
+	HOEDOWN_EXT_QUOTE |\
+	HOEDOWN_EXT_SUPERSCRIPT |\
+	HOEDOWN_EXT_MATH )
+
+#define HOEDOWN_EXT_FLAGS (\
+	HOEDOWN_EXT_NO_INTRA_EMPHASIS |\
+	HOEDOWN_EXT_SPACE_HEADERS |\
+	HOEDOWN_EXT_MATH_EXPLICIT )
+
+#define HOEDOWN_EXT_NEGATIVE (\
+	HOEDOWN_EXT_DISABLE_INDENTED_CODE )
+
+typedef enum hoedown_list_flags {
+	HOEDOWN_LIST_ORDERED = (1 << 0),
+	HOEDOWN_LI_BLOCK = (1 << 1)	/* <li> containing block data */
+} hoedown_list_flags;
+
+typedef enum hoedown_table_flags {
+	HOEDOWN_TABLE_ALIGN_LEFT = 1,
+	HOEDOWN_TABLE_ALIGN_RIGHT = 2,
+	HOEDOWN_TABLE_ALIGN_CENTER = 3,
+	HOEDOWN_TABLE_ALIGNMASK = 3,
+	HOEDOWN_TABLE_HEADER = 4
+} hoedown_table_flags;
+
+typedef enum hoedown_autolink_type {
+	HOEDOWN_AUTOLINK_NONE,		/* used internally when it is not an autolink*/
+	HOEDOWN_AUTOLINK_NORMAL,	/* normal http/http/ftp/mailto/etc link */
+	HOEDOWN_AUTOLINK_EMAIL		/* e-mail link without explit mailto: */
+} hoedown_autolink_type;
+
+
+/*********
+ * TYPES *
+ *********/
+
+struct hoedown_document;
+typedef struct hoedown_document hoedown_document;
+
+struct hoedown_renderer_data {
+	void *opaque;
+};
+typedef struct hoedown_renderer_data hoedown_renderer_data;
+
+/* hoedown_renderer - functions for rendering parsed data */
+struct hoedown_renderer {
+	/* state object */
+	void *opaque;
+
+	/* block level callbacks - NULL skips the block */
+	void (*blockcode)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_buffer *lang, const hoedown_renderer_data *data);
+	void (*blockquote)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*header)(hoedown_buffer *ob, const hoedown_buffer *content, int level, const hoedown_renderer_data *data);
+	void (*hrule)(hoedown_buffer *ob, const hoedown_renderer_data *data);
+	void (*list)(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_list_flags flags, const hoedown_renderer_data *data);
+	void (*listitem)(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_list_flags flags, const hoedown_renderer_data *data);
+	void (*paragraph)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*table)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*table_header)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*table_body)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*table_row)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*table_cell)(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_table_flags flags, const hoedown_renderer_data *data);
+	void (*footnotes)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	void (*footnote_def)(hoedown_buffer *ob, const hoedown_buffer *content, unsigned int num, const hoedown_renderer_data *data);
+	void (*blockhtml)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data);
+
+	/* span level callbacks - NULL or return 0 prints the span verbatim */
+	int (*autolink)(hoedown_buffer *ob, const hoedown_buffer *link, hoedown_autolink_type type, const hoedown_renderer_data *data);
+	int (*codespan)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data);
+	int (*double_emphasis)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*emphasis)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*underline)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*highlight)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*quote)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*image)(hoedown_buffer *ob, const hoedown_buffer *link, const hoedown_buffer *title, const hoedown_buffer *alt, const hoedown_renderer_data *data);
+	int (*linebreak)(hoedown_buffer *ob, const hoedown_renderer_data *data);
+	int (*link)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_buffer *link, const hoedown_buffer *title, const hoedown_renderer_data *data);
+	int (*triple_emphasis)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*strikethrough)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*superscript)(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data);
+	int (*footnote_ref)(hoedown_buffer *ob, unsigned int num, const hoedown_renderer_data *data);
+	int (*math)(hoedown_buffer *ob, const hoedown_buffer *text, int displaymode, const hoedown_renderer_data *data);
+	int (*raw_html)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data);
+
+	/* low level callbacks - NULL copies input directly into the output */
+	void (*entity)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data);
+	void (*normal_text)(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data);
+
+	/* miscellaneous callbacks */
+	void (*doc_header)(hoedown_buffer *ob, int inline_render, const hoedown_renderer_data *data);
+	void (*doc_footer)(hoedown_buffer *ob, int inline_render, const hoedown_renderer_data *data);
+};
+typedef struct hoedown_renderer hoedown_renderer;
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_document_new: allocate a new document processor instance */
+hoedown_document *hoedown_document_new(
+	const hoedown_renderer *renderer,
+	hoedown_extensions extensions,
+	size_t max_nesting
+) __attribute__ ((malloc));
+
+/* hoedown_document_render: render regular Markdown using the document processor */
+void hoedown_document_render(hoedown_document *doc, hoedown_buffer *ob, const uint8_t *data, size_t size);
+
+/* hoedown_document_render_inline: render inline Markdown using the document processor */
+void hoedown_document_render_inline(hoedown_document *doc, hoedown_buffer *ob, const uint8_t *data, size_t size);
+
+/* hoedown_document_free: deallocate a document processor instance */
+void hoedown_document_free(hoedown_document *doc);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_DOCUMENT_H **/
diff --git a/libraries/hoedown/include/hoedown/escape.h b/libraries/hoedown/include/hoedown/escape.h
new file mode 100644
index 00000000..d7659c27
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/escape.h
@@ -0,0 +1,28 @@
+/* escape.h - escape utilities */
+
+#ifndef HOEDOWN_ESCAPE_H
+#define HOEDOWN_ESCAPE_H
+
+#include "buffer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_escape_href: escape (part of) a URL inside HTML */
+void hoedown_escape_href(hoedown_buffer *ob, const uint8_t *data, size_t size);
+
+/* hoedown_escape_html: escape HTML */
+void hoedown_escape_html(hoedown_buffer *ob, const uint8_t *data, size_t size, int secure);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_ESCAPE_H **/
diff --git a/libraries/hoedown/include/hoedown/html.h b/libraries/hoedown/include/hoedown/html.h
new file mode 100644
index 00000000..e46e7fd6
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/html.h
@@ -0,0 +1,84 @@
+/* html.h - HTML renderer and utilities */
+
+#ifndef HOEDOWN_HTML_H
+#define HOEDOWN_HTML_H
+
+#include "document.h"
+#include "buffer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************
+ * CONSTANTS *
+ *************/
+
+typedef enum hoedown_html_flags {
+	HOEDOWN_HTML_SKIP_HTML = (1 << 0),
+	HOEDOWN_HTML_ESCAPE = (1 << 1),
+	HOEDOWN_HTML_HARD_WRAP = (1 << 2),
+	HOEDOWN_HTML_USE_XHTML = (1 << 3)
+} hoedown_html_flags;
+
+typedef enum hoedown_html_tag {
+	HOEDOWN_HTML_TAG_NONE = 0,
+	HOEDOWN_HTML_TAG_OPEN,
+	HOEDOWN_HTML_TAG_CLOSE
+} hoedown_html_tag;
+
+
+/*********
+ * TYPES *
+ *********/
+
+struct hoedown_html_renderer_state {
+	void *opaque;
+
+	struct {
+		int header_count;
+		int current_level;
+		int level_offset;
+		int nesting_level;
+	} toc_data;
+
+	hoedown_html_flags flags;
+
+	/* extra callbacks */
+	void (*link_attributes)(hoedown_buffer *ob, const hoedown_buffer *url, const hoedown_renderer_data *data);
+};
+typedef struct hoedown_html_renderer_state hoedown_html_renderer_state;
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_html_smartypants: process an HTML snippet using SmartyPants for smart punctuation */
+void hoedown_html_smartypants(hoedown_buffer *ob, const uint8_t *data, size_t size);
+
+/* hoedown_html_is_tag: checks if data starts with a specific tag, returns the tag type or NONE */
+hoedown_html_tag hoedown_html_is_tag(const uint8_t *data, size_t size, const char *tagname);
+
+
+/* hoedown_html_renderer_new: allocates a regular HTML renderer */
+hoedown_renderer *hoedown_html_renderer_new(
+	hoedown_html_flags render_flags,
+	int nesting_level
+) __attribute__ ((malloc));
+
+/* hoedown_html_toc_renderer_new: like hoedown_html_renderer_new, but the returned renderer produces the Table of Contents */
+hoedown_renderer *hoedown_html_toc_renderer_new(
+	int nesting_level
+) __attribute__ ((malloc));
+
+/* hoedown_html_renderer_free: deallocate an HTML renderer */
+void hoedown_html_renderer_free(hoedown_renderer *renderer);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_HTML_H **/
diff --git a/libraries/hoedown/include/hoedown/stack.h b/libraries/hoedown/include/hoedown/stack.h
new file mode 100644
index 00000000..bf9b439b
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/stack.h
@@ -0,0 +1,52 @@
+/* stack.h - simple stacking */
+
+#ifndef HOEDOWN_STACK_H
+#define HOEDOWN_STACK_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*********
+ * TYPES *
+ *********/
+
+struct hoedown_stack {
+	void **item;
+	size_t size;
+	size_t asize;
+};
+typedef struct hoedown_stack hoedown_stack;
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_stack_init: initialize a stack */
+void hoedown_stack_init(hoedown_stack *st, size_t initial_size);
+
+/* hoedown_stack_uninit: free internal data of the stack */
+void hoedown_stack_uninit(hoedown_stack *st);
+
+/* hoedown_stack_grow: increase the allocated size to the given value */
+void hoedown_stack_grow(hoedown_stack *st, size_t neosz);
+
+/* hoedown_stack_push: push an item to the top of the stack */
+void hoedown_stack_push(hoedown_stack *st, void *item);
+
+/* hoedown_stack_pop: retrieve and remove the item at the top of the stack */
+void *hoedown_stack_pop(hoedown_stack *st);
+
+/* hoedown_stack_top: retrieve the item at the top of the stack */
+void *hoedown_stack_top(const hoedown_stack *st);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_STACK_H **/
diff --git a/libraries/hoedown/include/hoedown/version.h b/libraries/hoedown/include/hoedown/version.h
new file mode 100644
index 00000000..4938cae5
--- /dev/null
+++ b/libraries/hoedown/include/hoedown/version.h
@@ -0,0 +1,33 @@
+/* version.h - holds Hoedown's version */
+
+#ifndef HOEDOWN_VERSION_H
+#define HOEDOWN_VERSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************
+ * CONSTANTS *
+ *************/
+
+#define HOEDOWN_VERSION "3.0.2"
+#define HOEDOWN_VERSION_MAJOR 3
+#define HOEDOWN_VERSION_MINOR 0
+#define HOEDOWN_VERSION_REVISION 2
+
+
+/*************
+ * FUNCTIONS *
+ *************/
+
+/* hoedown_version: retrieve Hoedown's version numbers */
+void hoedown_version(int *major, int *minor, int *revision);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /** HOEDOWN_VERSION_H **/
diff --git a/libraries/hoedown/src/autolink.c b/libraries/hoedown/src/autolink.c
new file mode 100644
index 00000000..9bc7fad5
--- /dev/null
+++ b/libraries/hoedown/src/autolink.c
@@ -0,0 +1,281 @@
+#include "hoedown/autolink.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#ifndef _MSC_VER
+#include <strings.h>
+#else
+#define strncasecmp	_strnicmp
+#endif
+
+int
+hoedown_autolink_is_safe(const uint8_t *data, size_t size)
+{
+	static const size_t valid_uris_count = 6;
+	static const char *valid_uris[] = {
+		"http://", "https://", "/", "#", "ftp://", "mailto:"
+	};
+	static const size_t valid_uris_size[] = { 7, 8, 1, 1, 6, 7 };
+	size_t i;
+
+	for (i = 0; i < valid_uris_count; ++i) {
+		size_t len = valid_uris_size[i];
+
+		if (size > len &&
+			strncasecmp((char *)data, valid_uris[i], len) == 0 &&
+			isalnum(data[len]))
+			return 1;
+	}
+
+	return 0;
+}
+
+static size_t
+autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
+{
+	uint8_t cclose, copen = 0;
+	size_t i;
+
+	for (i = 0; i < link_end; ++i)
+		if (data[i] == '<') {
+			link_end = i;
+			break;
+		}
+
+	while (link_end > 0) {
+		if (strchr("?!.,:", data[link_end - 1]) != NULL)
+			link_end--;
+
+		else if (data[link_end - 1] == ';') {
+			size_t new_end = link_end - 2;
+
+			while (new_end > 0 && isalpha(data[new_end]))
+				new_end--;
+
+			if (new_end < link_end - 2 && data[new_end] == '&')
+				link_end = new_end;
+			else
+				link_end--;
+		}
+		else break;
+	}
+
+	if (link_end == 0)
+		return 0;
+
+	cclose = data[link_end - 1];
+
+	switch (cclose) {
+	case '"':	copen = '"'; break;
+	case '\'':	copen = '\''; break;
+	case ')':	copen = '('; break;
+	case ']':	copen = '['; break;
+	case '}':	copen = '{'; break;
+	}
+
+	if (copen != 0) {
+		size_t closing = 0;
+		size_t opening = 0;
+		size_t i = 0;
+
+		/* Try to close the final punctuation sign in this same line;
+		 * if we managed to close it outside of the URL, that means that it's
+		 * not part of the URL. If it closes inside the URL, that means it
+		 * is part of the URL.
+		 *
+		 * Examples:
+		 *
+		 *	foo http://www.pokemon.com/Pikachu_(Electric) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *	foo (http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
+		 *
+		 *	foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> http://www.pokemon.com/Pikachu_(Electric))
+		 *
+		 *	(foo http://www.pokemon.com/Pikachu_(Electric)) bar
+		 *		=> foo http://www.pokemon.com/Pikachu_(Electric)
+		 */
+
+		while (i < link_end) {
+			if (data[i] == copen)
+				opening++;
+			else if (data[i] == cclose)
+				closing++;
+
+			i++;
+		}
+
+		if (closing != opening)
+			link_end--;
+	}
+
+	return link_end;
+}
+
+static size_t
+check_domain(uint8_t *data, size_t size, int allow_short)
+{
+	size_t i, np = 0;
+
+	if (!isalnum(data[0]))
+		return 0;
+
+	for (i = 1; i < size - 1; ++i) {
+		if (strchr(".:", data[i]) != NULL) np++;
+		else if (!isalnum(data[i]) && data[i] != '-') break;
+	}
+
+	if (allow_short) {
+		/* We don't need a valid domain in the strict sense (with
+		 * least one dot; so just make sure it's composed of valid
+		 * domain characters and return the length of the the valid
+		 * sequence. */
+		return i;
+	} else {
+		/* a valid domain needs to have at least a dot.
+		 * that's as far as we get */
+		return np ? i : 0;
+	}
+}
+
+size_t
+hoedown_autolink__www(
+	size_t *rewind_p,
+	hoedown_buffer *link,
+	uint8_t *data,
+	size_t max_rewind,
+	size_t size,
+	unsigned int flags)
+{
+	size_t link_end;
+
+	if (max_rewind > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
+		return 0;
+
+	if (size < 4 || memcmp(data, "www.", strlen("www.")) != 0)
+		return 0;
+
+	link_end = check_domain(data, size, 0);
+
+	if (link_end == 0)
+		return 0;
+
+	while (link_end < size && !isspace(data[link_end]))
+		link_end++;
+
+	link_end = autolink_delim(data, link_end, max_rewind, size);
+
+	if (link_end == 0)
+		return 0;
+
+	hoedown_buffer_put(link, data, link_end);
+	*rewind_p = 0;
+
+	return (int)link_end;
+}
+
+size_t
+hoedown_autolink__email(
+	size_t *rewind_p,
+	hoedown_buffer *link,
+	uint8_t *data,
+	size_t max_rewind,
+	size_t size,
+	unsigned int flags)
+{
+	size_t link_end, rewind;
+	int nb = 0, np = 0;
+
+	for (rewind = 0; rewind < max_rewind; ++rewind) {
+		uint8_t c = data[-1 - rewind];
+
+		if (isalnum(c))
+			continue;
+
+		if (strchr(".+-_", c) != NULL)
+			continue;
+
+		break;
+	}
+
+	if (rewind == 0)
+		return 0;
+
+	for (link_end = 0; link_end < size; ++link_end) {
+		uint8_t c = data[link_end];
+
+		if (isalnum(c))
+			continue;
+
+		if (c == '@')
+			nb++;
+		else if (c == '.' && link_end < size - 1)
+			np++;
+		else if (c != '-' && c != '_')
+			break;
+	}
+
+	if (link_end < 2 || nb != 1 || np == 0 ||
+		!isalpha(data[link_end - 1]))
+		return 0;
+
+	link_end = autolink_delim(data, link_end, max_rewind, size);
+
+	if (link_end == 0)
+		return 0;
+
+	hoedown_buffer_put(link, data - rewind, link_end + rewind);
+	*rewind_p = rewind;
+
+	return link_end;
+}
+
+size_t
+hoedown_autolink__url(
+	size_t *rewind_p,
+	hoedown_buffer *link,
+	uint8_t *data,
+	size_t max_rewind,
+	size_t size,
+	unsigned int flags)
+{
+	size_t link_end, rewind = 0, domain_len;
+
+	if (size < 4 || data[1] != '/' || data[2] != '/')
+		return 0;
+
+	while (rewind < max_rewind && isalpha(data[-1 - rewind]))
+		rewind++;
+
+	if (!hoedown_autolink_is_safe(data - rewind, size + rewind))
+		return 0;
+
+	link_end = strlen("://");
+
+	domain_len = check_domain(
+		data + link_end,
+		size - link_end,
+		flags & HOEDOWN_AUTOLINK_SHORT_DOMAINS);
+
+	if (domain_len == 0)
+		return 0;
+
+	link_end += domain_len;
+	while (link_end < size && !isspace(data[link_end]))
+		link_end++;
+
+	link_end = autolink_delim(data, link_end, max_rewind, size);
+
+	if (link_end == 0)
+		return 0;
+
+	hoedown_buffer_put(link, data - rewind, link_end + rewind);
+	*rewind_p = rewind;
+
+	return link_end;
+}
diff --git a/libraries/hoedown/src/buffer.c b/libraries/hoedown/src/buffer.c
new file mode 100644
index 00000000..1c7ba55a
--- /dev/null
+++ b/libraries/hoedown/src/buffer.c
@@ -0,0 +1,308 @@
+#include "hoedown/buffer.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+void *
+hoedown_malloc(size_t size)
+{
+	void *ret = malloc(size);
+
+	if (!ret) {
+		fprintf(stderr, "Allocation failed.\n");
+		abort();
+	}
+
+	return ret;
+}
+
+void *
+hoedown_calloc(size_t nmemb, size_t size)
+{
+	void *ret = calloc(nmemb, size);
+
+	if (!ret) {
+		fprintf(stderr, "Allocation failed.\n");
+		abort();
+	}
+
+	return ret;
+}
+
+void *
+hoedown_realloc(void *ptr, size_t size)
+{
+	void *ret = realloc(ptr, size);
+
+	if (!ret) {
+		fprintf(stderr, "Allocation failed.\n");
+		abort();
+	}
+
+	return ret;
+}
+
+void
+hoedown_buffer_init(
+	hoedown_buffer *buf,
+	size_t unit,
+	hoedown_realloc_callback data_realloc,
+	hoedown_free_callback data_free,
+	hoedown_free_callback buffer_free)
+{
+	assert(buf);
+
+	buf->data = NULL;
+	buf->size = buf->asize = 0;
+	buf->unit = unit;
+	buf->data_realloc = data_realloc;
+	buf->data_free = data_free;
+	buf->buffer_free = buffer_free;
+}
+
+void
+hoedown_buffer_uninit(hoedown_buffer *buf)
+{
+	assert(buf && buf->unit);
+	buf->data_free(buf->data);
+}
+
+hoedown_buffer *
+hoedown_buffer_new(size_t unit)
+{
+	hoedown_buffer *ret = hoedown_malloc(sizeof (hoedown_buffer));
+	hoedown_buffer_init(ret, unit, hoedown_realloc, free, free);
+	return ret;
+}
+
+void
+hoedown_buffer_free(hoedown_buffer *buf)
+{
+	if (!buf) return;
+	assert(buf && buf->unit);
+
+	buf->data_free(buf->data);
+
+	if (buf->buffer_free)
+		buf->buffer_free(buf);
+}
+
+void
+hoedown_buffer_reset(hoedown_buffer *buf)
+{
+	assert(buf && buf->unit);
+
+	buf->data_free(buf->data);
+	buf->data = NULL;
+	buf->size = buf->asize = 0;
+}
+
+void
+hoedown_buffer_grow(hoedown_buffer *buf, size_t neosz)
+{
+	size_t neoasz;
+	assert(buf && buf->unit);
+
+	if (buf->asize >= neosz)
+		return;
+
+	neoasz = buf->asize + buf->unit;
+	while (neoasz < neosz)
+		neoasz += buf->unit;
+
+	buf->data = (uint8_t *) buf->data_realloc(buf->data, neoasz);
+	buf->asize = neoasz;
+}
+
+void
+hoedown_buffer_put(hoedown_buffer *buf, const uint8_t *data, size_t size)
+{
+	assert(buf && buf->unit);
+
+	if (buf->size + size > buf->asize)
+		hoedown_buffer_grow(buf, buf->size + size);
+
+	memcpy(buf->data + buf->size, data, size);
+	buf->size += size;
+}
+
+void
+hoedown_buffer_puts(hoedown_buffer *buf, const char *str)
+{
+	hoedown_buffer_put(buf, (const uint8_t *)str, strlen(str));
+}
+
+void
+hoedown_buffer_putc(hoedown_buffer *buf, uint8_t c)
+{
+	assert(buf && buf->unit);
+
+	if (buf->size >= buf->asize)
+		hoedown_buffer_grow(buf, buf->size + 1);
+
+	buf->data[buf->size] = c;
+	buf->size += 1;
+}
+
+int
+hoedown_buffer_putf(hoedown_buffer *buf, FILE *file)
+{
+	assert(buf && buf->unit);
+
+	while (!(feof(file) || ferror(file))) {
+		hoedown_buffer_grow(buf, buf->size + buf->unit);
+		buf->size += fread(buf->data + buf->size, 1, buf->unit, file);
+	}
+
+	return ferror(file);
+}
+
+void
+hoedown_buffer_set(hoedown_buffer *buf, const uint8_t *data, size_t size)
+{
+	assert(buf && buf->unit);
+
+	if (size > buf->asize)
+		hoedown_buffer_grow(buf, size);
+
+	memcpy(buf->data, data, size);
+	buf->size = size;
+}
+
+void
+hoedown_buffer_sets(hoedown_buffer *buf, const char *str)
+{
+	hoedown_buffer_set(buf, (const uint8_t *)str, strlen(str));
+}
+
+int
+hoedown_buffer_eq(const hoedown_buffer *buf, const uint8_t *data, size_t size)
+{
+	if (buf->size != size) return 0;
+	return memcmp(buf->data, data, size) == 0;
+}
+
+int
+hoedown_buffer_eqs(const hoedown_buffer *buf, const char *str)
+{
+	return hoedown_buffer_eq(buf, (const uint8_t *)str, strlen(str));
+}
+
+int
+hoedown_buffer_prefix(const hoedown_buffer *buf, const char *prefix)
+{
+	size_t i;
+
+	for (i = 0; i < buf->size; ++i) {
+		if (prefix[i] == 0)
+			return 0;
+
+		if (buf->data[i] != prefix[i])
+			return buf->data[i] - prefix[i];
+	}
+
+	return 0;
+}
+
+void
+hoedown_buffer_slurp(hoedown_buffer *buf, size_t size)
+{
+	assert(buf && buf->unit);
+
+	if (size >= buf->size) {
+		buf->size = 0;
+		return;
+	}
+
+	buf->size -= size;
+	memmove(buf->data, buf->data + size, buf->size);
+}
+
+const char *
+hoedown_buffer_cstr(hoedown_buffer *buf)
+{
+	assert(buf && buf->unit);
+
+	if (buf->size < buf->asize && buf->data[buf->size] == 0)
+		return (char *)buf->data;
+
+	hoedown_buffer_grow(buf, buf->size + 1);
+	buf->data[buf->size] = 0;
+
+	return (char *)buf->data;
+}
+
+void
+hoedown_buffer_printf(hoedown_buffer *buf, const char *fmt, ...)
+{
+	va_list ap;
+	int n;
+
+	assert(buf && buf->unit);
+
+	if (buf->size >= buf->asize)
+		hoedown_buffer_grow(buf, buf->size + 1);
+
+	va_start(ap, fmt);
+	n = vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
+	va_end(ap);
+
+	if (n < 0) {
+#ifndef _MSC_VER
+		return;
+#else
+		va_start(ap, fmt);
+		n = _vscprintf(fmt, ap);
+		va_end(ap);
+#endif
+	}
+
+	if ((size_t)n >= buf->asize - buf->size) {
+		hoedown_buffer_grow(buf, buf->size + n + 1);
+
+		va_start(ap, fmt);
+		n = vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
+		va_end(ap);
+	}
+
+	if (n < 0)
+		return;
+
+	buf->size += n;
+}
+
+void hoedown_buffer_put_utf8(hoedown_buffer *buf, unsigned int c) {
+	unsigned char unichar[4];
+
+	assert(buf && buf->unit);
+
+	if (c < 0x80) {
+		hoedown_buffer_putc(buf, c);
+	}
+	else if (c < 0x800) {
+		unichar[0] = 192 + (c / 64);
+		unichar[1] = 128 + (c % 64);
+		hoedown_buffer_put(buf, unichar, 2);
+	}
+	else if (c - 0xd800u < 0x800) {
+		HOEDOWN_BUFPUTSL(buf, "\xef\xbf\xbd");
+	}
+	else if (c < 0x10000) {
+		unichar[0] = 224 + (c / 4096);
+		unichar[1] = 128 + (c / 64) % 64;
+		unichar[2] = 128 + (c % 64);
+		hoedown_buffer_put(buf, unichar, 3);
+	}
+	else if (c < 0x110000) {
+		unichar[0] = 240 + (c / 262144);
+		unichar[1] = 128 + (c / 4096) % 64;
+		unichar[2] = 128 + (c / 64) % 64;
+		unichar[3] = 128 + (c % 64);
+		hoedown_buffer_put(buf, unichar, 4);
+	}
+	else {
+		HOEDOWN_BUFPUTSL(buf, "\xef\xbf\xbd");
+	}
+}
diff --git a/libraries/hoedown/src/document.c b/libraries/hoedown/src/document.c
new file mode 100644
index 00000000..8ba82e47
--- /dev/null
+++ b/libraries/hoedown/src/document.c
@@ -0,0 +1,2958 @@
+#include "hoedown/document.h"
+
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+
+#include "hoedown/stack.h"
+
+#ifndef _MSC_VER
+#include <strings.h>
+#else
+#define strncasecmp	_strnicmp
+#endif
+
+#define REF_TABLE_SIZE 8
+
+#define BUFFER_BLOCK 0
+#define BUFFER_SPAN 1
+
+#define HOEDOWN_LI_END 8	/* internal list flag */
+
+const char *hoedown_find_block_tag(const char *str, unsigned int len);
+
+/***************
+ * LOCAL TYPES *
+ ***************/
+
+/* link_ref: reference to a link */
+struct link_ref {
+	unsigned int id;
+
+	hoedown_buffer *link;
+	hoedown_buffer *title;
+
+	struct link_ref *next;
+};
+
+/* footnote_ref: reference to a footnote */
+struct footnote_ref {
+	unsigned int id;
+
+	int is_used;
+	unsigned int num;
+
+	hoedown_buffer *contents;
+};
+
+/* footnote_item: an item in a footnote_list */
+struct footnote_item {
+	struct footnote_ref *ref;
+	struct footnote_item *next;
+};
+
+/* footnote_list: linked list of footnote_item */
+struct footnote_list {
+	unsigned int count;
+	struct footnote_item *head;
+	struct footnote_item *tail;
+};
+
+/* char_trigger: function pointer to render active chars */
+/*   returns the number of chars taken care of */
+/*   data is the pointer of the beginning of the span */
+/*   offset is the number of valid chars before data */
+typedef size_t
+(*char_trigger)(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+
+static size_t char_emphasis(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_quote(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_linebreak(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_codespan(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_escape(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_entity(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_langle_tag(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_autolink_url(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_autolink_email(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_autolink_www(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_link(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_superscript(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+static size_t char_math(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size);
+
+enum markdown_char_t {
+	MD_CHAR_NONE = 0,
+	MD_CHAR_EMPHASIS,
+	MD_CHAR_CODESPAN,
+	MD_CHAR_LINEBREAK,
+	MD_CHAR_LINK,
+	MD_CHAR_LANGLE,
+	MD_CHAR_ESCAPE,
+	MD_CHAR_ENTITY,
+	MD_CHAR_AUTOLINK_URL,
+	MD_CHAR_AUTOLINK_EMAIL,
+	MD_CHAR_AUTOLINK_WWW,
+	MD_CHAR_SUPERSCRIPT,
+	MD_CHAR_QUOTE,
+	MD_CHAR_MATH
+};
+
+static char_trigger markdown_char_ptrs[] = {
+	NULL,
+	&char_emphasis,
+	&char_codespan,
+	&char_linebreak,
+	&char_link,
+	&char_langle_tag,
+	&char_escape,
+	&char_entity,
+	&char_autolink_url,
+	&char_autolink_email,
+	&char_autolink_www,
+	&char_superscript,
+	&char_quote,
+	&char_math
+};
+
+struct hoedown_document {
+	hoedown_renderer md;
+	hoedown_renderer_data data;
+
+	struct link_ref *refs[REF_TABLE_SIZE];
+	struct footnote_list footnotes_found;
+	struct footnote_list footnotes_used;
+	uint8_t active_char[256];
+	hoedown_stack work_bufs[2];
+	hoedown_extensions ext_flags;
+	size_t max_nesting;
+	int in_link_body;
+};
+
+/***************************
+ * HELPER FUNCTIONS *
+ ***************************/
+
+static hoedown_buffer *
+newbuf(hoedown_document *doc, int type)
+{
+	static const size_t buf_size[2] = {256, 64};
+	hoedown_buffer *work = NULL;
+	hoedown_stack *pool = &doc->work_bufs[type];
+
+	if (pool->size < pool->asize &&
+		pool->item[pool->size] != NULL) {
+		work = pool->item[pool->size++];
+		work->size = 0;
+	} else {
+		work = hoedown_buffer_new(buf_size[type]);
+		hoedown_stack_push(pool, work);
+	}
+
+	return work;
+}
+
+static void
+popbuf(hoedown_document *doc, int type)
+{
+	doc->work_bufs[type].size--;
+}
+
+static void
+unscape_text(hoedown_buffer *ob, hoedown_buffer *src)
+{
+	size_t i = 0, org;
+	while (i < src->size) {
+		org = i;
+		while (i < src->size && src->data[i] != '\\')
+			i++;
+
+		if (i > org)
+			hoedown_buffer_put(ob, src->data + org, i - org);
+
+		if (i + 1 >= src->size)
+			break;
+
+		hoedown_buffer_putc(ob, src->data[i + 1]);
+		i += 2;
+	}
+}
+
+static unsigned int
+hash_link_ref(const uint8_t *link_ref, size_t length)
+{
+	size_t i;
+	unsigned int hash = 0;
+
+	for (i = 0; i < length; ++i)
+		hash = tolower(link_ref[i]) + (hash << 6) + (hash << 16) - hash;
+
+	return hash;
+}
+
+static struct link_ref *
+add_link_ref(
+	struct link_ref **references,
+	const uint8_t *name, size_t name_size)
+{
+	struct link_ref *ref = hoedown_calloc(1, sizeof(struct link_ref));
+
+	ref->id = hash_link_ref(name, name_size);
+	ref->next = references[ref->id % REF_TABLE_SIZE];
+
+	references[ref->id % REF_TABLE_SIZE] = ref;
+	return ref;
+}
+
+static struct link_ref *
+find_link_ref(struct link_ref **references, uint8_t *name, size_t length)
+{
+	unsigned int hash = hash_link_ref(name, length);
+	struct link_ref *ref = NULL;
+
+	ref = references[hash % REF_TABLE_SIZE];
+
+	while (ref != NULL) {
+		if (ref->id == hash)
+			return ref;
+
+		ref = ref->next;
+	}
+
+	return NULL;
+}
+
+static void
+free_link_refs(struct link_ref **references)
+{
+	size_t i;
+
+	for (i = 0; i < REF_TABLE_SIZE; ++i) {
+		struct link_ref *r = references[i];
+		struct link_ref *next;
+
+		while (r) {
+			next = r->next;
+			hoedown_buffer_free(r->link);
+			hoedown_buffer_free(r->title);
+			free(r);
+			r = next;
+		}
+	}
+}
+
+static struct footnote_ref *
+create_footnote_ref(struct footnote_list *list, const uint8_t *name, size_t name_size)
+{
+	struct footnote_ref *ref = hoedown_calloc(1, sizeof(struct footnote_ref));
+
+	ref->id = hash_link_ref(name, name_size);
+
+	return ref;
+}
+
+static int
+add_footnote_ref(struct footnote_list *list, struct footnote_ref *ref)
+{
+	struct footnote_item *item = hoedown_calloc(1, sizeof(struct footnote_item));
+	if (!item)
+		return 0;
+	item->ref = ref;
+
+	if (list->head == NULL) {
+		list->head = list->tail = item;
+	} else {
+		list->tail->next = item;
+		list->tail = item;
+	}
+	list->count++;
+
+	return 1;
+}
+
+static struct footnote_ref *
+find_footnote_ref(struct footnote_list *list, uint8_t *name, size_t length)
+{
+	unsigned int hash = hash_link_ref(name, length);
+	struct footnote_item *item = NULL;
+
+	item = list->head;
+
+	while (item != NULL) {
+		if (item->ref->id == hash)
+			return item->ref;
+		item = item->next;
+	}
+
+	return NULL;
+}
+
+static void
+free_footnote_ref(struct footnote_ref *ref)
+{
+	hoedown_buffer_free(ref->contents);
+	free(ref);
+}
+
+static void
+free_footnote_list(struct footnote_list *list, int free_refs)
+{
+	struct footnote_item *item = list->head;
+	struct footnote_item *next;
+
+	while (item) {
+		next = item->next;
+		if (free_refs)
+			free_footnote_ref(item->ref);
+		free(item);
+		item = next;
+	}
+}
+
+
+/*
+ * Check whether a char is a Markdown spacing char.
+
+ * Right now we only consider spaces the actual
+ * space and a newline: tabs and carriage returns
+ * are filtered out during the preprocessing phase.
+ *
+ * If we wanted to actually be UTF-8 compliant, we
+ * should instead extract an Unicode codepoint from
+ * this character and check for space properties.
+ */
+static int
+_isspace(int c)
+{
+	return c == ' ' || c == '\n';
+}
+
+/* is_empty_all: verify that all the data is spacing */
+static int
+is_empty_all(const uint8_t *data, size_t size)
+{
+	size_t i = 0;
+	while (i < size && _isspace(data[i])) i++;
+	return i == size;
+}
+
+/*
+ * Replace all spacing characters in data with spaces. As a special
+ * case, this collapses a newline with the previous space, if possible.
+ */
+static void
+replace_spacing(hoedown_buffer *ob, const uint8_t *data, size_t size)
+{
+	size_t i = 0, mark;
+	hoedown_buffer_grow(ob, size);
+	while (1) {
+		mark = i;
+		while (i < size && data[i] != '\n') i++;
+		hoedown_buffer_put(ob, data + mark, i - mark);
+
+		if (i >= size) break;
+
+		if (!(i > 0 && data[i-1] == ' '))
+			hoedown_buffer_putc(ob, ' ');
+		i++;
+	}
+}
+
+/****************************
+ * INLINE PARSING FUNCTIONS *
+ ****************************/
+
+/* is_mail_autolink • looks for the address part of a mail autolink and '>' */
+/* this is less strict than the original markdown e-mail address matching */
+static size_t
+is_mail_autolink(uint8_t *data, size_t size)
+{
+	size_t i = 0, nb = 0;
+
+	/* address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@' */
+	for (i = 0; i < size; ++i) {
+		if (isalnum(data[i]))
+			continue;
+
+		switch (data[i]) {
+			case '@':
+				nb++;
+
+			case '-':
+			case '.':
+			case '_':
+				break;
+
+			case '>':
+				return (nb == 1) ? i + 1 : 0;
+
+			default:
+				return 0;
+		}
+	}
+
+	return 0;
+}
+
+/* tag_length • returns the length of the given tag, or 0 is it's not valid */
+static size_t
+tag_length(uint8_t *data, size_t size, hoedown_autolink_type *autolink)
+{
+	size_t i, j;
+
+	/* a valid tag can't be shorter than 3 chars */
+	if (size < 3) return 0;
+
+	/* begins with a '<' optionally followed by '/', followed by letter or number */
+	if (data[0] != '<') return 0;
+	i = (data[1] == '/') ? 2 : 1;
+
+	if (!isalnum(data[i]))
+		return 0;
+
+	/* scheme test */
+	*autolink = HOEDOWN_AUTOLINK_NONE;
+
+	/* try to find the beginning of an URI */
+	while (i < size && (isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
+		i++;
+
+	if (i > 1 && data[i] == '@') {
+		if ((j = is_mail_autolink(data + i, size - i)) != 0) {
+			*autolink = HOEDOWN_AUTOLINK_EMAIL;
+			return i + j;
+		}
+	}
+
+	if (i > 2 && data[i] == ':') {
+		*autolink = HOEDOWN_AUTOLINK_NORMAL;
+		i++;
+	}
+
+	/* completing autolink test: no spacing or ' or " */
+	if (i >= size)
+		*autolink = HOEDOWN_AUTOLINK_NONE;
+
+	else if (*autolink) {
+		j = i;
+
+		while (i < size) {
+			if (data[i] == '\\') i += 2;
+			else if (data[i] == '>' || data[i] == '\'' ||
+					data[i] == '"' || data[i] == ' ' || data[i] == '\n')
+					break;
+			else i++;
+		}
+
+		if (i >= size) return 0;
+		if (i > j && data[i] == '>') return i + 1;
+		/* one of the forbidden chars has been found */
+		*autolink = HOEDOWN_AUTOLINK_NONE;
+	}
+
+	/* looking for something looking like a tag end */
+	while (i < size && data[i] != '>') i++;
+	if (i >= size) return 0;
+	return i + 1;
+}
+
+/* parse_inline • parses inline markdown elements */
+static void
+parse_inline(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	size_t i = 0, end = 0, consumed = 0;
+	hoedown_buffer work = { 0, 0, 0, 0, NULL, NULL, NULL };
+	uint8_t *active_char = doc->active_char;
+
+	if (doc->work_bufs[BUFFER_SPAN].size +
+		doc->work_bufs[BUFFER_BLOCK].size > doc->max_nesting)
+		return;
+
+	while (i < size) {
+		/* copying inactive chars into the output */
+		while (end < size && active_char[data[end]] == 0)
+			end++;
+
+		if (doc->md.normal_text) {
+			work.data = data + i;
+			work.size = end - i;
+			doc->md.normal_text(ob, &work, &doc->data);
+		}
+		else
+			hoedown_buffer_put(ob, data + i, end - i);
+
+		if (end >= size) break;
+		i = end;
+
+		end = markdown_char_ptrs[ (int)active_char[data[end]] ](ob, doc, data + i, i - consumed, size - i);
+		if (!end) /* no action from the callback */
+			end = i + 1;
+		else {
+			i += end;
+			end = i;
+			consumed = i;
+		}
+	}
+}
+
+/* is_escaped • returns whether special char at data[loc] is escaped by '\\' */
+static int
+is_escaped(uint8_t *data, size_t loc)
+{
+	size_t i = loc;
+	while (i >= 1 && data[i - 1] == '\\')
+		i--;
+
+	/* odd numbers of backslashes escapes data[loc] */
+	return (loc - i) % 2;
+}
+
+/* find_emph_char • looks for the next emph uint8_t, skipping other constructs */
+static size_t
+find_emph_char(uint8_t *data, size_t size, uint8_t c)
+{
+	size_t i = 0;
+
+	while (i < size) {
+		while (i < size && data[i] != c && data[i] != '[' && data[i] != '`')
+			i++;
+
+		if (i == size)
+			return 0;
+
+		/* not counting escaped chars */
+		if (is_escaped(data, i)) {
+			i++; continue;
+		}
+
+		if (data[i] == c)
+			return i;
+
+		/* skipping a codespan */
+		if (data[i] == '`') {
+			size_t span_nb = 0, bt;
+			size_t tmp_i = 0;
+
+			/* counting the number of opening backticks */
+			while (i < size && data[i] == '`') {
+				i++; span_nb++;
+			}
+
+			if (i >= size) return 0;
+
+			/* finding the matching closing sequence */
+			bt = 0;
+			while (i < size && bt < span_nb) {
+				if (!tmp_i && data[i] == c) tmp_i = i;
+				if (data[i] == '`') bt++;
+				else bt = 0;
+				i++;
+			}
+
+			/* not a well-formed codespan; use found matching emph char */
+			if (i >= size) return tmp_i;
+		}
+		/* skipping a link */
+		else if (data[i] == '[') {
+			size_t tmp_i = 0;
+			uint8_t cc;
+
+			i++;
+			while (i < size && data[i] != ']') {
+				if (!tmp_i && data[i] == c) tmp_i = i;
+				i++;
+			}
+
+			i++;
+			while (i < size && _isspace(data[i]))
+				i++;
+
+			if (i >= size)
+				return tmp_i;
+
+			switch (data[i]) {
+			case '[':
+				cc = ']'; break;
+
+			case '(':
+				cc = ')'; break;
+
+			default:
+				if (tmp_i)
+					return tmp_i;
+				else
+					continue;
+			}
+
+			i++;
+			while (i < size && data[i] != cc) {
+				if (!tmp_i && data[i] == c) tmp_i = i;
+				i++;
+			}
+
+			if (i >= size)
+				return tmp_i;
+
+			i++;
+		}
+	}
+
+	return 0;
+}
+
+/* parse_emph1 • parsing single emphase */
+/* closed by a symbol not preceded by spacing and not followed by symbol */
+static size_t
+parse_emph1(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, uint8_t c)
+{
+	size_t i = 0, len;
+	hoedown_buffer *work = 0;
+	int r;
+
+	/* skipping one symbol if coming from emph3 */
+	if (size > 1 && data[0] == c && data[1] == c) i = 1;
+
+	while (i < size) {
+		len = find_emph_char(data + i, size - i, c);
+		if (!len) return 0;
+		i += len;
+		if (i >= size) return 0;
+
+		if (data[i] == c && !_isspace(data[i - 1])) {
+
+			if (doc->ext_flags & HOEDOWN_EXT_NO_INTRA_EMPHASIS) {
+				if (i + 1 < size && isalnum(data[i + 1]))
+					continue;
+			}
+
+			work = newbuf(doc, BUFFER_SPAN);
+			parse_inline(work, doc, data, i);
+
+			if (doc->ext_flags & HOEDOWN_EXT_UNDERLINE && c == '_')
+				r = doc->md.underline(ob, work, &doc->data);
+			else
+				r = doc->md.emphasis(ob, work, &doc->data);
+
+			popbuf(doc, BUFFER_SPAN);
+			return r ? i + 1 : 0;
+		}
+	}
+
+	return 0;
+}
+
+/* parse_emph2 • parsing single emphase */
+static size_t
+parse_emph2(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, uint8_t c)
+{
+	size_t i = 0, len;
+	hoedown_buffer *work = 0;
+	int r;
+
+	while (i < size) {
+		len = find_emph_char(data + i, size - i, c);
+		if (!len) return 0;
+		i += len;
+
+		if (i + 1 < size && data[i] == c && data[i + 1] == c && i && !_isspace(data[i - 1])) {
+			work = newbuf(doc, BUFFER_SPAN);
+			parse_inline(work, doc, data, i);
+
+			if (c == '~')
+				r = doc->md.strikethrough(ob, work, &doc->data);
+			else if (c == '=')
+				r = doc->md.highlight(ob, work, &doc->data);
+			else
+				r = doc->md.double_emphasis(ob, work, &doc->data);
+
+			popbuf(doc, BUFFER_SPAN);
+			return r ? i + 2 : 0;
+		}
+		i++;
+	}
+	return 0;
+}
+
+/* parse_emph3 • parsing single emphase */
+/* finds the first closing tag, and delegates to the other emph */
+static size_t
+parse_emph3(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, uint8_t c)
+{
+	size_t i = 0, len;
+	int r;
+
+	while (i < size) {
+		len = find_emph_char(data + i, size - i, c);
+		if (!len) return 0;
+		i += len;
+
+		/* skip spacing preceded symbols */
+		if (data[i] != c || _isspace(data[i - 1]))
+			continue;
+
+		if (i + 2 < size && data[i + 1] == c && data[i + 2] == c && doc->md.triple_emphasis) {
+			/* triple symbol found */
+			hoedown_buffer *work = newbuf(doc, BUFFER_SPAN);
+
+			parse_inline(work, doc, data, i);
+			r = doc->md.triple_emphasis(ob, work, &doc->data);
+			popbuf(doc, BUFFER_SPAN);
+			return r ? i + 3 : 0;
+
+		} else if (i + 1 < size && data[i + 1] == c) {
+			/* double symbol found, handing over to emph1 */
+			len = parse_emph1(ob, doc, data - 2, size + 2, c);
+			if (!len) return 0;
+			else return len - 2;
+
+		} else {
+			/* single symbol found, handing over to emph2 */
+			len = parse_emph2(ob, doc, data - 1, size + 1, c);
+			if (!len) return 0;
+			else return len - 1;
+		}
+	}
+	return 0;
+}
+
+/* parse_math • parses a math span until the given ending delimiter */
+static size_t
+parse_math(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size, const char *end, size_t delimsz, int displaymode)
+{
+	hoedown_buffer text = { NULL, 0, 0, 0, NULL, NULL, NULL };
+	size_t i = delimsz;
+
+	if (!doc->md.math)
+		return 0;
+
+	/* find ending delimiter */
+	while (1) {
+		while (i < size && data[i] != (uint8_t)end[0])
+			i++;
+
+		if (i >= size)
+			return 0;
+
+		if (!is_escaped(data, i) && !(i + delimsz > size)
+			&& memcmp(data + i, end, delimsz) == 0)
+			break;
+
+		i++;
+	}
+
+	/* prepare buffers */
+	text.data = data + delimsz;
+	text.size = i - delimsz;
+
+	/* if this is a $$ and MATH_EXPLICIT is not active,
+	 * guess whether displaymode should be enabled from the context */
+	i += delimsz;
+	if (delimsz == 2 && !(doc->ext_flags & HOEDOWN_EXT_MATH_EXPLICIT))
+		displaymode = is_empty_all(data - offset, offset) && is_empty_all(data + i, size - i);
+
+	/* call callback */
+	if (doc->md.math(ob, &text, displaymode, &doc->data))
+		return i;
+
+	return 0;
+}
+
+/* char_emphasis • single and double emphasis parsing */
+static size_t
+char_emphasis(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	uint8_t c = data[0];
+	size_t ret;
+
+	if (doc->ext_flags & HOEDOWN_EXT_NO_INTRA_EMPHASIS) {
+		if (offset > 0 && !_isspace(data[-1]) && data[-1] != '>' && data[-1] != '(')
+			return 0;
+	}
+
+	if (size > 2 && data[1] != c) {
+		/* spacing cannot follow an opening emphasis;
+		 * strikethrough and highlight only takes two characters '~~' */
+		if (c == '~' || c == '=' || _isspace(data[1]) || (ret = parse_emph1(ob, doc, data + 1, size - 1, c)) == 0)
+			return 0;
+
+		return ret + 1;
+	}
+
+	if (size > 3 && data[1] == c && data[2] != c) {
+		if (_isspace(data[2]) || (ret = parse_emph2(ob, doc, data + 2, size - 2, c)) == 0)
+			return 0;
+
+		return ret + 2;
+	}
+
+	if (size > 4 && data[1] == c && data[2] == c && data[3] != c) {
+		if (c == '~' || c == '=' || _isspace(data[3]) || (ret = parse_emph3(ob, doc, data + 3, size - 3, c)) == 0)
+			return 0;
+
+		return ret + 3;
+	}
+
+	return 0;
+}
+
+
+/* char_linebreak • '\n' preceded by two spaces (assuming linebreak != 0) */
+static size_t
+char_linebreak(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	if (offset < 2 || data[-1] != ' ' || data[-2] != ' ')
+		return 0;
+
+	/* removing the last space from ob and rendering */
+	while (ob->size && ob->data[ob->size - 1] == ' ')
+		ob->size--;
+
+	return doc->md.linebreak(ob, &doc->data) ? 1 : 0;
+}
+
+
+/* char_codespan • '`' parsing a code span (assuming codespan != 0) */
+static size_t
+char_codespan(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	hoedown_buffer work = { NULL, 0, 0, 0, NULL, NULL, NULL };
+	size_t end, nb = 0, i, f_begin, f_end;
+
+	/* counting the number of backticks in the delimiter */
+	while (nb < size && data[nb] == '`')
+		nb++;
+
+	/* finding the next delimiter */
+	i = 0;
+	for (end = nb; end < size && i < nb; end++) {
+		if (data[end] == '`') i++;
+		else i = 0;
+	}
+
+	if (i < nb && end >= size)
+		return 0; /* no matching delimiter */
+
+	/* trimming outside spaces */
+	f_begin = nb;
+	while (f_begin < end && data[f_begin] == ' ')
+		f_begin++;
+
+	f_end = end - nb;
+	while (f_end > nb && data[f_end-1] == ' ')
+		f_end--;
+
+	/* real code span */
+	if (f_begin < f_end) {
+		work.data = data + f_begin;
+		work.size = f_end - f_begin;
+
+		if (!doc->md.codespan(ob, &work, &doc->data))
+			end = 0;
+	} else {
+		if (!doc->md.codespan(ob, 0, &doc->data))
+			end = 0;
+	}
+
+	return end;
+}
+
+/* char_quote • '"' parsing a quote */
+static size_t
+char_quote(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	size_t end, nq = 0, i, f_begin, f_end;
+
+	/* counting the number of quotes in the delimiter */
+	while (nq < size && data[nq] == '"')
+		nq++;
+
+	/* finding the next delimiter */
+	end = nq;
+	while (1) {
+		i = end;
+		end += find_emph_char(data + end, size - end, '"');
+		if (end == i) return 0;		/* no matching delimiter */
+		i = end;
+		while (end < size && data[end] == '"' && end - i < nq) end++;
+		if (end - i >= nq) break;
+	}
+
+	/* trimming outside spaces */
+	f_begin = nq;
+	while (f_begin < end && data[f_begin] == ' ')
+		f_begin++;
+
+	f_end = end - nq;
+	while (f_end > nq && data[f_end-1] == ' ')
+		f_end--;
+
+	/* real quote */
+	if (f_begin < f_end) {
+		hoedown_buffer *work = newbuf(doc, BUFFER_SPAN);
+		parse_inline(work, doc, data + f_begin, f_end - f_begin);
+
+		if (!doc->md.quote(ob, work, &doc->data))
+			end = 0;
+		popbuf(doc, BUFFER_SPAN);
+	} else {
+		if (!doc->md.quote(ob, 0, &doc->data))
+			end = 0;
+	}
+
+	return end;
+}
+
+
+/* char_escape • '\\' backslash escape */
+static size_t
+char_escape(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~=\"$";
+	hoedown_buffer work = { 0, 0, 0, 0, NULL, NULL, NULL };
+	size_t w;
+
+	if (size > 1) {
+		if (data[1] == '\\' && (doc->ext_flags & HOEDOWN_EXT_MATH) &&
+			size > 2 && (data[2] == '(' || data[2] == '[')) {
+			const char *end = (data[2] == '[') ? "\\\\]" : "\\\\)";
+			w = parse_math(ob, doc, data, offset, size, end, 3, data[2] == '[');
+			if (w) return w;
+		}
+
+		if (strchr(escape_chars, data[1]) == NULL)
+			return 0;
+
+		if (doc->md.normal_text) {
+			work.data = data + 1;
+			work.size = 1;
+			doc->md.normal_text(ob, &work, &doc->data);
+		}
+		else hoedown_buffer_putc(ob, data[1]);
+	} else if (size == 1) {
+		hoedown_buffer_putc(ob, data[0]);
+	}
+
+	return 2;
+}
+
+/* char_entity • '&' escaped when it doesn't belong to an entity */
+/* valid entities are assumed to be anything matching &#?[A-Za-z0-9]+; */
+static size_t
+char_entity(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	size_t end = 1;
+	hoedown_buffer work = { 0, 0, 0, 0, NULL, NULL, NULL };
+
+	if (end < size && data[end] == '#')
+		end++;
+
+	while (end < size && isalnum(data[end]))
+		end++;
+
+	if (end < size && data[end] == ';')
+		end++; /* real entity */
+	else
+		return 0; /* lone '&' */
+
+	if (doc->md.entity) {
+		work.data = data;
+		work.size = end;
+		doc->md.entity(ob, &work, &doc->data);
+	}
+	else hoedown_buffer_put(ob, data, end);
+
+	return end;
+}
+
+/* char_langle_tag • '<' when tags or autolinks are allowed */
+static size_t
+char_langle_tag(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	hoedown_buffer work = { NULL, 0, 0, 0, NULL, NULL, NULL };
+	hoedown_autolink_type altype = HOEDOWN_AUTOLINK_NONE;
+	size_t end = tag_length(data, size, &altype);
+	int ret = 0;
+
+	work.data = data;
+	work.size = end;
+
+	if (end > 2) {
+		if (doc->md.autolink && altype != HOEDOWN_AUTOLINK_NONE) {
+			hoedown_buffer *u_link = newbuf(doc, BUFFER_SPAN);
+			work.data = data + 1;
+			work.size = end - 2;
+			unscape_text(u_link, &work);
+			ret = doc->md.autolink(ob, u_link, altype, &doc->data);
+			popbuf(doc, BUFFER_SPAN);
+		}
+		else if (doc->md.raw_html)
+			ret = doc->md.raw_html(ob, &work, &doc->data);
+	}
+
+	if (!ret) return 0;
+	else return end;
+}
+
+static size_t
+char_autolink_www(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	hoedown_buffer *link, *link_url, *link_text;
+	size_t link_len, rewind;
+
+	if (!doc->md.link || doc->in_link_body)
+		return 0;
+
+	link = newbuf(doc, BUFFER_SPAN);
+
+	if ((link_len = hoedown_autolink__www(&rewind, link, data, offset, size, HOEDOWN_AUTOLINK_SHORT_DOMAINS)) > 0) {
+		link_url = newbuf(doc, BUFFER_SPAN);
+		HOEDOWN_BUFPUTSL(link_url, "http://");
+		hoedown_buffer_put(link_url, link->data, link->size);
+
+		ob->size -= rewind;
+		if (doc->md.normal_text) {
+			link_text = newbuf(doc, BUFFER_SPAN);
+			doc->md.normal_text(link_text, link, &doc->data);
+			doc->md.link(ob, link_text, link_url, NULL, &doc->data);
+			popbuf(doc, BUFFER_SPAN);
+		} else {
+			doc->md.link(ob, link, link_url, NULL, &doc->data);
+		}
+		popbuf(doc, BUFFER_SPAN);
+	}
+
+	popbuf(doc, BUFFER_SPAN);
+	return link_len;
+}
+
+static size_t
+char_autolink_email(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	hoedown_buffer *link;
+	size_t link_len, rewind;
+
+	if (!doc->md.autolink || doc->in_link_body)
+		return 0;
+
+	link = newbuf(doc, BUFFER_SPAN);
+
+	if ((link_len = hoedown_autolink__email(&rewind, link, data, offset, size, 0)) > 0) {
+		ob->size -= rewind;
+		doc->md.autolink(ob, link, HOEDOWN_AUTOLINK_EMAIL, &doc->data);
+	}
+
+	popbuf(doc, BUFFER_SPAN);
+	return link_len;
+}
+
+static size_t
+char_autolink_url(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	hoedown_buffer *link;
+	size_t link_len, rewind;
+
+	if (!doc->md.autolink || doc->in_link_body)
+		return 0;
+
+	link = newbuf(doc, BUFFER_SPAN);
+
+	if ((link_len = hoedown_autolink__url(&rewind, link, data, offset, size, 0)) > 0) {
+		ob->size -= rewind;
+		doc->md.autolink(ob, link, HOEDOWN_AUTOLINK_NORMAL, &doc->data);
+	}
+
+	popbuf(doc, BUFFER_SPAN);
+	return link_len;
+}
+
+/* char_link • '[': parsing a link, a footnote or an image */
+static size_t
+char_link(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	int is_img = (offset && data[-1] == '!' && !is_escaped(data - offset, offset - 1));
+	int is_footnote = (doc->ext_flags & HOEDOWN_EXT_FOOTNOTES && data[1] == '^');
+	size_t i = 1, txt_e, link_b = 0, link_e = 0, title_b = 0, title_e = 0;
+	hoedown_buffer *content = NULL;
+	hoedown_buffer *link = NULL;
+	hoedown_buffer *title = NULL;
+	hoedown_buffer *u_link = NULL;
+	size_t org_work_size = doc->work_bufs[BUFFER_SPAN].size;
+	int ret = 0, in_title = 0, qtype = 0;
+
+	/* checking whether the correct renderer exists */
+	if ((is_footnote && !doc->md.footnote_ref) || (is_img && !doc->md.image)
+		|| (!is_img && !is_footnote && !doc->md.link))
+		goto cleanup;
+
+	/* looking for the matching closing bracket */
+	i += find_emph_char(data + i, size - i, ']');
+	txt_e = i;
+
+	if (i < size && data[i] == ']') i++;
+	else goto cleanup;
+
+	/* footnote link */
+	if (is_footnote) {
+		hoedown_buffer id = { NULL, 0, 0, 0, NULL, NULL, NULL };
+		struct footnote_ref *fr;
+
+		if (txt_e < 3)
+			goto cleanup;
+
+		id.data = data + 2;
+		id.size = txt_e - 2;
+
+		fr = find_footnote_ref(&doc->footnotes_found, id.data, id.size);
+
+		/* mark footnote used */
+		if (fr && !fr->is_used) {
+			if(!add_footnote_ref(&doc->footnotes_used, fr))
+				goto cleanup;
+			fr->is_used = 1;
+			fr->num = doc->footnotes_used.count;
+
+			/* render */
+			if (doc->md.footnote_ref)
+				ret = doc->md.footnote_ref(ob, fr->num, &doc->data);
+		}
+
+		goto cleanup;
+	}
+
+	/* skip any amount of spacing */
+	/* (this is much more laxist than original markdown syntax) */
+	while (i < size && _isspace(data[i]))
+		i++;
+
+	/* inline style link */
+	if (i < size && data[i] == '(') {
+		size_t nb_p;
+
+		/* skipping initial spacing */
+		i++;
+
+		while (i < size && _isspace(data[i]))
+			i++;
+
+		link_b = i;
+
+		/* looking for link end: ' " ) */
+		/* Count the number of open parenthesis */
+		nb_p = 0;
+
+		while (i < size) {
+			if (data[i] == '\\') i += 2;
+			else if (data[i] == '(' && i != 0) {
+				nb_p++; i++;
+			}
+			else if (data[i] == ')') {
+				if (nb_p == 0) break;
+				else nb_p--; i++;
+			} else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
+			else i++;
+		}
+
+		if (i >= size) goto cleanup;
+		link_e = i;
+
+		/* looking for title end if present */
+		if (data[i] == '\'' || data[i] == '"') {
+			qtype = data[i];
+			in_title = 1;
+			i++;
+			title_b = i;
+
+			while (i < size) {
+				if (data[i] == '\\') i += 2;
+				else if (data[i] == qtype) {in_title = 0; i++;}
+				else if ((data[i] == ')') && !in_title) break;
+				else i++;
+			}
+
+			if (i >= size) goto cleanup;
+
+			/* skipping spacing after title */
+			title_e = i - 1;
+			while (title_e > title_b && _isspace(data[title_e]))
+				title_e--;
+
+			/* checking for closing quote presence */
+			if (data[title_e] != '\'' &&  data[title_e] != '"') {
+				title_b = title_e = 0;
+				link_e = i;
+			}
+		}
+
+		/* remove spacing at the end of the link */
+		while (link_e > link_b && _isspace(data[link_e - 1]))
+			link_e--;
+
+		/* remove optional angle brackets around the link */
+		if (data[link_b] == '<') link_b++;
+		if (data[link_e - 1] == '>') link_e--;
+
+		/* building escaped link and title */
+		if (link_e > link_b) {
+			link = newbuf(doc, BUFFER_SPAN);
+			hoedown_buffer_put(link, data + link_b, link_e - link_b);
+		}
+
+		if (title_e > title_b) {
+			title = newbuf(doc, BUFFER_SPAN);
+			hoedown_buffer_put(title, data + title_b, title_e - title_b);
+		}
+
+		i++;
+	}
+
+	/* reference style link */
+	else if (i < size && data[i] == '[') {
+		hoedown_buffer *id = newbuf(doc, BUFFER_SPAN);
+		struct link_ref *lr;
+
+		/* looking for the id */
+		i++;
+		link_b = i;
+		while (i < size && data[i] != ']') i++;
+		if (i >= size) goto cleanup;
+		link_e = i;
+
+		/* finding the link_ref */
+		if (link_b == link_e)
+			replace_spacing(id, data + 1, txt_e - 1);
+		else
+			hoedown_buffer_put(id, data + link_b, link_e - link_b);
+
+		lr = find_link_ref(doc->refs, id->data, id->size);
+		if (!lr)
+			goto cleanup;
+
+		/* keeping link and title from link_ref */
+		link = lr->link;
+		title = lr->title;
+		i++;
+	}
+
+	/* shortcut reference style link */
+	else {
+		hoedown_buffer *id = newbuf(doc, BUFFER_SPAN);
+		struct link_ref *lr;
+
+		/* crafting the id */
+		replace_spacing(id, data + 1, txt_e - 1);
+
+		/* finding the link_ref */
+		lr = find_link_ref(doc->refs, id->data, id->size);
+		if (!lr)
+			goto cleanup;
+
+		/* keeping link and title from link_ref */
+		link = lr->link;
+		title = lr->title;
+
+		/* rewinding the spacing */
+		i = txt_e + 1;
+	}
+
+	/* building content: img alt is kept, only link content is parsed */
+	if (txt_e > 1) {
+		content = newbuf(doc, BUFFER_SPAN);
+		if (is_img) {
+			hoedown_buffer_put(content, data + 1, txt_e - 1);
+		} else {
+			/* disable autolinking when parsing inline the
+			 * content of a link */
+			doc->in_link_body = 1;
+			parse_inline(content, doc, data + 1, txt_e - 1);
+			doc->in_link_body = 0;
+		}
+	}
+
+	if (link) {
+		u_link = newbuf(doc, BUFFER_SPAN);
+		unscape_text(u_link, link);
+	}
+
+	/* calling the relevant rendering function */
+	if (is_img) {
+		if (ob->size && ob->data[ob->size - 1] == '!')
+			ob->size -= 1;
+
+		ret = doc->md.image(ob, u_link, title, content, &doc->data);
+	} else {
+		ret = doc->md.link(ob, content, u_link, title, &doc->data);
+	}
+
+	/* cleanup */
+cleanup:
+	doc->work_bufs[BUFFER_SPAN].size = (int)org_work_size;
+	return ret ? i : 0;
+}
+
+static size_t
+char_superscript(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	size_t sup_start, sup_len;
+	hoedown_buffer *sup;
+
+	if (!doc->md.superscript)
+		return 0;
+
+	if (size < 2)
+		return 0;
+
+	if (data[1] == '(') {
+		sup_start = 2;
+		sup_len = find_emph_char(data + 2, size - 2, ')') + 2;
+
+		if (sup_len == size)
+			return 0;
+	} else {
+		sup_start = sup_len = 1;
+
+		while (sup_len < size && !_isspace(data[sup_len]))
+			sup_len++;
+	}
+
+	if (sup_len - sup_start == 0)
+		return (sup_start == 2) ? 3 : 0;
+
+	sup = newbuf(doc, BUFFER_SPAN);
+	parse_inline(sup, doc, data + sup_start, sup_len - sup_start);
+	doc->md.superscript(ob, sup, &doc->data);
+	popbuf(doc, BUFFER_SPAN);
+
+	return (sup_start == 2) ? sup_len + 1 : sup_len;
+}
+
+static size_t
+char_math(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offset, size_t size)
+{
+	/* double dollar */
+	if (size > 1 && data[1] == '$')
+		return parse_math(ob, doc, data, offset, size, "$$", 2, 1);
+
+	/* single dollar allowed only with MATH_EXPLICIT flag */
+	if (doc->ext_flags & HOEDOWN_EXT_MATH_EXPLICIT)
+		return parse_math(ob, doc, data, offset, size, "$", 1, 0);
+
+	return 0;
+}
+
+/*********************************
+ * BLOCK-LEVEL PARSING FUNCTIONS *
+ *********************************/
+
+/* is_empty • returns the line length when it is empty, 0 otherwise */
+static size_t
+is_empty(const uint8_t *data, size_t size)
+{
+	size_t i;
+
+	for (i = 0; i < size && data[i] != '\n'; i++)
+		if (data[i] != ' ')
+			return 0;
+
+	return i + 1;
+}
+
+/* is_hrule • returns whether a line is a horizontal rule */
+static int
+is_hrule(uint8_t *data, size_t size)
+{
+	size_t i = 0, n = 0;
+	uint8_t c;
+
+	/* skipping initial spaces */
+	if (size < 3) return 0;
+	if (data[0] == ' ') { i++;
+	if (data[1] == ' ') { i++;
+	if (data[2] == ' ') { i++; } } }
+
+	/* looking at the hrule uint8_t */
+	if (i + 2 >= size
+	|| (data[i] != '*' && data[i] != '-' && data[i] != '_'))
+		return 0;
+	c = data[i];
+
+	/* the whole line must be the char or space */
+	while (i < size && data[i] != '\n') {
+		if (data[i] == c) n++;
+		else if (data[i] != ' ')
+			return 0;
+
+		i++;
+	}
+
+	return n >= 3;
+}
+
+/* check if a line is a code fence; return the
+ * end of the code fence. if passed, width of
+ * the fence rule and character will be returned */
+static size_t
+is_codefence(uint8_t *data, size_t size, size_t *width, uint8_t *chr)
+{
+	size_t i = 0, n = 1;
+	uint8_t c;
+
+	/* skipping initial spaces */
+	if (size < 3)
+		return 0;
+
+	if (data[0] == ' ') { i++;
+	if (data[1] == ' ') { i++;
+	if (data[2] == ' ') { i++; } } }
+
+	/* looking at the hrule uint8_t */
+	c = data[i];
+	if (i + 2 >= size || !(c=='~' || c=='`'))
+		return 0;
+
+	/* the fence must be that same character */
+	while (++i < size && data[i] == c)
+		++n;
+
+	if (n < 3)
+		return 0;
+
+	if (width) *width = n;
+	if (chr) *chr = c;
+	return i;
+}
+
+/* expects single line, checks if it's a codefence and extracts language */
+static size_t
+parse_codefence(uint8_t *data, size_t size, hoedown_buffer *lang, size_t *width, uint8_t *chr)
+{
+	size_t i, w, lang_start;
+
+	i = w = is_codefence(data, size, width, chr);
+	if (i == 0)
+		return 0;
+
+	while (i < size && _isspace(data[i]))
+		i++;
+
+	lang_start = i;
+
+	while (i < size && !_isspace(data[i]))
+		i++;
+
+	lang->data = data + lang_start;
+	lang->size = i - lang_start;
+
+	/* Avoid parsing a codespan as a fence */
+	i = lang_start + 2;
+	while (i < size && !(data[i] == *chr && data[i-1] == *chr && data[i-2] == *chr)) i++;
+	if (i < size) return 0;
+
+	return w;
+}
+
+/* is_atxheader • returns whether the line is a hash-prefixed header */
+static int
+is_atxheader(hoedown_document *doc, uint8_t *data, size_t size)
+{
+	if (data[0] != '#')
+		return 0;
+
+	if (doc->ext_flags & HOEDOWN_EXT_SPACE_HEADERS) {
+		size_t level = 0;
+
+		while (level < size && level < 6 && data[level] == '#')
+			level++;
+
+		if (level < size && data[level] != ' ')
+			return 0;
+	}
+
+	return 1;
+}
+
+/* is_headerline • returns whether the line is a setext-style hdr underline */
+static int
+is_headerline(uint8_t *data, size_t size)
+{
+	size_t i = 0;
+
+	/* test of level 1 header */
+	if (data[i] == '=') {
+		for (i = 1; i < size && data[i] == '='; i++);
+		while (i < size && data[i] == ' ') i++;
+		return (i >= size || data[i] == '\n') ? 1 : 0; }
+
+	/* test of level 2 header */
+	if (data[i] == '-') {
+		for (i = 1; i < size && data[i] == '-'; i++);
+		while (i < size && data[i] == ' ') i++;
+		return (i >= size || data[i] == '\n') ? 2 : 0; }
+
+	return 0;
+}
+
+static int
+is_next_headerline(uint8_t *data, size_t size)
+{
+	size_t i = 0;
+
+	while (i < size && data[i] != '\n')
+		i++;
+
+	if (++i >= size)
+		return 0;
+
+	return is_headerline(data + i, size - i);
+}
+
+/* prefix_quote • returns blockquote prefix length */
+static size_t
+prefix_quote(uint8_t *data, size_t size)
+{
+	size_t i = 0;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+
+	if (i < size && data[i] == '>') {
+		if (i + 1 < size && data[i + 1] == ' ')
+			return i + 2;
+
+		return i + 1;
+	}
+
+	return 0;
+}
+
+/* prefix_code • returns prefix length for block code*/
+static size_t
+prefix_code(uint8_t *data, size_t size)
+{
+	if (size > 3 && data[0] == ' ' && data[1] == ' '
+		&& data[2] == ' ' && data[3] == ' ') return 4;
+
+	return 0;
+}
+
+/* prefix_oli • returns ordered list item prefix */
+static size_t
+prefix_oli(uint8_t *data, size_t size)
+{
+	size_t i = 0;
+
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+
+	if (i >= size || data[i] < '0' || data[i] > '9')
+		return 0;
+
+	while (i < size && data[i] >= '0' && data[i] <= '9')
+		i++;
+
+	if (i + 1 >= size || data[i] != '.' || data[i + 1] != ' ')
+		return 0;
+
+	if (is_next_headerline(data + i, size - i))
+		return 0;
+
+	return i + 2;
+}
+
+/* prefix_uli • returns ordered list item prefix */
+static size_t
+prefix_uli(uint8_t *data, size_t size)
+{
+	size_t i = 0;
+
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+
+	if (i + 1 >= size ||
+		(data[i] != '*' && data[i] != '+' && data[i] != '-') ||
+		data[i + 1] != ' ')
+		return 0;
+
+	if (is_next_headerline(data + i, size - i))
+		return 0;
+
+	return i + 2;
+}
+
+
+/* parse_block • parsing of one block, returning next uint8_t to parse */
+static void parse_block(hoedown_buffer *ob, hoedown_document *doc,
+			uint8_t *data, size_t size);
+
+
+/* parse_blockquote • handles parsing of a blockquote fragment */
+static size_t
+parse_blockquote(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	size_t beg, end = 0, pre, work_size = 0;
+	uint8_t *work_data = 0;
+	hoedown_buffer *out = 0;
+
+	out = newbuf(doc, BUFFER_BLOCK);
+	beg = 0;
+	while (beg < size) {
+		for (end = beg + 1; end < size && data[end - 1] != '\n'; end++);
+
+		pre = prefix_quote(data + beg, end - beg);
+
+		if (pre)
+			beg += pre; /* skipping prefix */
+
+		/* empty line followed by non-quote line */
+		else if (is_empty(data + beg, end - beg) &&
+				(end >= size || (prefix_quote(data + end, size - end) == 0 &&
+				!is_empty(data + end, size - end))))
+			break;
+
+		if (beg < end) { /* copy into the in-place working buffer */
+			/* hoedown_buffer_put(work, data + beg, end - beg); */
+			if (!work_data)
+				work_data = data + beg;
+			else if (data + beg != work_data + work_size)
+				memmove(work_data + work_size, data + beg, end - beg);
+			work_size += end - beg;
+		}
+		beg = end;
+	}
+
+	parse_block(out, doc, work_data, work_size);
+	if (doc->md.blockquote)
+		doc->md.blockquote(ob, out, &doc->data);
+	popbuf(doc, BUFFER_BLOCK);
+	return end;
+}
+
+static size_t
+parse_htmlblock(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, int do_render);
+
+/* parse_blockquote • handles parsing of a regular paragraph */
+static size_t
+parse_paragraph(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	hoedown_buffer work = { NULL, 0, 0, 0, NULL, NULL, NULL };
+	size_t i = 0, end = 0;
+	int level = 0;
+
+	work.data = data;
+
+	while (i < size) {
+		for (end = i + 1; end < size && data[end - 1] != '\n'; end++) /* empty */;
+
+		if (is_empty(data + i, size - i))
+			break;
+
+		if ((level = is_headerline(data + i, size - i)) != 0)
+			break;
+
+		if (is_atxheader(doc, data + i, size - i) ||
+			is_hrule(data + i, size - i) ||
+			prefix_quote(data + i, size - i)) {
+			end = i;
+			break;
+		}
+
+		i = end;
+	}
+
+	work.size = i;
+	while (work.size && data[work.size - 1] == '\n')
+		work.size--;
+
+	if (!level) {
+		hoedown_buffer *tmp = newbuf(doc, BUFFER_BLOCK);
+		parse_inline(tmp, doc, work.data, work.size);
+		if (doc->md.paragraph)
+			doc->md.paragraph(ob, tmp, &doc->data);
+		popbuf(doc, BUFFER_BLOCK);
+	} else {
+		hoedown_buffer *header_work;
+
+		if (work.size) {
+			size_t beg;
+			i = work.size;
+			work.size -= 1;
+
+			while (work.size && data[work.size] != '\n')
+				work.size -= 1;
+
+			beg = work.size + 1;
+			while (work.size && data[work.size - 1] == '\n')
+				work.size -= 1;
+
+			if (work.size > 0) {
+				hoedown_buffer *tmp = newbuf(doc, BUFFER_BLOCK);
+				parse_inline(tmp, doc, work.data, work.size);
+
+				if (doc->md.paragraph)
+					doc->md.paragraph(ob, tmp, &doc->data);
+
+				popbuf(doc, BUFFER_BLOCK);
+				work.data += beg;
+				work.size = i - beg;
+			}
+			else work.size = i;
+		}
+
+		header_work = newbuf(doc, BUFFER_SPAN);
+		parse_inline(header_work, doc, work.data, work.size);
+
+		if (doc->md.header)
+			doc->md.header(ob, header_work, (int)level, &doc->data);
+
+		popbuf(doc, BUFFER_SPAN);
+	}
+
+	return end;
+}
+
+/* parse_fencedcode • handles parsing of a block-level code fragment */
+static size_t
+parse_fencedcode(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	hoedown_buffer text = { 0, 0, 0, 0, NULL, NULL, NULL };
+	hoedown_buffer lang = { 0, 0, 0, 0, NULL, NULL, NULL };
+	size_t i = 0, text_start, line_start;
+	size_t w, w2;
+	size_t width, width2;
+	uint8_t chr, chr2;
+
+	/* parse codefence line */
+	while (i < size && data[i] != '\n')
+		i++;
+
+	w = parse_codefence(data, i, &lang, &width, &chr);
+	if (!w)
+		return 0;
+
+	/* search for end */
+	i++;
+	text_start = i;
+	while ((line_start = i) < size) {
+		while (i < size && data[i] != '\n')
+			i++;
+
+		w2 = is_codefence(data + line_start, i - line_start, &width2, &chr2);
+		if (w == w2 && width == width2 && chr == chr2 &&
+		    is_empty(data + (line_start+w), i - (line_start+w)))
+			break;
+
+		i++;
+	}
+
+	text.data = data + text_start;
+	text.size = line_start - text_start;
+
+	if (doc->md.blockcode)
+		doc->md.blockcode(ob, text.size ? &text : NULL, lang.size ? &lang : NULL, &doc->data);
+
+	return i;
+}
+
+static size_t
+parse_blockcode(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	size_t beg, end, pre;
+	hoedown_buffer *work = 0;
+
+	work = newbuf(doc, BUFFER_BLOCK);
+
+	beg = 0;
+	while (beg < size) {
+		for (end = beg + 1; end < size && data[end - 1] != '\n'; end++) {};
+		pre = prefix_code(data + beg, end - beg);
+
+		if (pre)
+			beg += pre; /* skipping prefix */
+		else if (!is_empty(data + beg, end - beg))
+			/* non-empty non-prefixed line breaks the pre */
+			break;
+
+		if (beg < end) {
+			/* verbatim copy to the working buffer,
+				escaping entities */
+			if (is_empty(data + beg, end - beg))
+				hoedown_buffer_putc(work, '\n');
+			else hoedown_buffer_put(work, data + beg, end - beg);
+		}
+		beg = end;
+	}
+
+	while (work->size && work->data[work->size - 1] == '\n')
+		work->size -= 1;
+
+	hoedown_buffer_putc(work, '\n');
+
+	if (doc->md.blockcode)
+		doc->md.blockcode(ob, work, NULL, &doc->data);
+
+	popbuf(doc, BUFFER_BLOCK);
+	return beg;
+}
+
+/* parse_listitem • parsing of a single list item */
+/*	assuming initial prefix is already removed */
+static size_t
+parse_listitem(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, hoedown_list_flags *flags)
+{
+	hoedown_buffer *work = 0, *inter = 0;
+	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
+	int in_empty = 0, has_inside_empty = 0, in_fence = 0;
+
+	/* keeping track of the first indentation prefix */
+	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
+		orgpre++;
+
+	beg = prefix_uli(data, size);
+	if (!beg)
+		beg = prefix_oli(data, size);
+
+	if (!beg)
+		return 0;
+
+	/* skipping to the beginning of the following line */
+	end = beg;
+	while (end < size && data[end - 1] != '\n')
+		end++;
+
+	/* getting working buffers */
+	work = newbuf(doc, BUFFER_SPAN);
+	inter = newbuf(doc, BUFFER_SPAN);
+
+	/* putting the first line into the working buffer */
+	hoedown_buffer_put(work, data + beg, end - beg);
+	beg = end;
+
+	/* process the following lines */
+	while (beg < size) {
+		size_t has_next_uli = 0, has_next_oli = 0;
+
+		end++;
+
+		while (end < size && data[end - 1] != '\n')
+			end++;
+
+		/* process an empty line */
+		if (is_empty(data + beg, end - beg)) {
+			in_empty = 1;
+			beg = end;
+			continue;
+		}
+
+		/* calculating the indentation */
+		i = 0;
+		while (i < 4 && beg + i < end && data[beg + i] == ' ')
+			i++;
+
+		pre = i;
+
+		if (doc->ext_flags & HOEDOWN_EXT_FENCED_CODE) {
+			if (is_codefence(data + beg + i, end - beg - i, NULL, NULL))
+				in_fence = !in_fence;
+		}
+
+		/* Only check for new list items if we are **not** inside
+		 * a fenced code block */
+		if (!in_fence) {
+			has_next_uli = prefix_uli(data + beg + i, end - beg - i);
+			has_next_oli = prefix_oli(data + beg + i, end - beg - i);
+		}
+
+		/* checking for a new item */
+		if ((has_next_uli && !is_hrule(data + beg + i, end - beg - i)) || has_next_oli) {
+			if (in_empty)
+				has_inside_empty = 1;
+
+			/* the following item must have the same (or less) indentation */
+			if (pre <= orgpre) {
+				/* if the following item has different list type, we end this list */
+				if (in_empty && (
+					((*flags & HOEDOWN_LIST_ORDERED) && has_next_uli) ||
+					(!(*flags & HOEDOWN_LIST_ORDERED) && has_next_oli)))
+					*flags |= HOEDOWN_LI_END;
+
+				break;
+			}
+
+			if (!sublist)
+				sublist = work->size;
+		}
+		/* joining only indented stuff after empty lines;
+		 * note that now we only require 1 space of indentation
+		 * to continue a list */
+		else if (in_empty && pre == 0) {
+			*flags |= HOEDOWN_LI_END;
+			break;
+		}
+
+		if (in_empty) {
+			hoedown_buffer_putc(work, '\n');
+			has_inside_empty = 1;
+			in_empty = 0;
+		}
+
+		/* adding the line without prefix into the working buffer */
+		hoedown_buffer_put(work, data + beg + i, end - beg - i);
+		beg = end;
+	}
+
+	/* render of li contents */
+	if (has_inside_empty)
+		*flags |= HOEDOWN_LI_BLOCK;
+
+	if (*flags & HOEDOWN_LI_BLOCK) {
+		/* intermediate render of block li */
+		if (sublist && sublist < work->size) {
+			parse_block(inter, doc, work->data, sublist);
+			parse_block(inter, doc, work->data + sublist, work->size - sublist);
+		}
+		else
+			parse_block(inter, doc, work->data, work->size);
+	} else {
+		/* intermediate render of inline li */
+		if (sublist && sublist < work->size) {
+			parse_inline(inter, doc, work->data, sublist);
+			parse_block(inter, doc, work->data + sublist, work->size - sublist);
+		}
+		else
+			parse_inline(inter, doc, work->data, work->size);
+	}
+
+	/* render of li itself */
+	if (doc->md.listitem)
+		doc->md.listitem(ob, inter, *flags, &doc->data);
+
+	popbuf(doc, BUFFER_SPAN);
+	popbuf(doc, BUFFER_SPAN);
+	return beg;
+}
+
+
+/* parse_list • parsing ordered or unordered list block */
+static size_t
+parse_list(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, hoedown_list_flags flags)
+{
+	hoedown_buffer *work = 0;
+	size_t i = 0, j;
+
+	work = newbuf(doc, BUFFER_BLOCK);
+
+	while (i < size) {
+		j = parse_listitem(work, doc, data + i, size - i, &flags);
+		i += j;
+
+		if (!j || (flags & HOEDOWN_LI_END))
+			break;
+	}
+
+	if (doc->md.list)
+		doc->md.list(ob, work, flags, &doc->data);
+	popbuf(doc, BUFFER_BLOCK);
+	return i;
+}
+
+/* parse_atxheader • parsing of atx-style headers */
+static size_t
+parse_atxheader(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	size_t level = 0;
+	size_t i, end, skip;
+
+	while (level < size && level < 6 && data[level] == '#')
+		level++;
+
+	for (i = level; i < size && data[i] == ' '; i++);
+
+	for (end = i; end < size && data[end] != '\n'; end++);
+	skip = end;
+
+	while (end && data[end - 1] == '#')
+		end--;
+
+	while (end && data[end - 1] == ' ')
+		end--;
+
+	if (end > i) {
+		hoedown_buffer *work = newbuf(doc, BUFFER_SPAN);
+
+		parse_inline(work, doc, data + i, end - i);
+
+		if (doc->md.header)
+			doc->md.header(ob, work, (int)level, &doc->data);
+
+		popbuf(doc, BUFFER_SPAN);
+	}
+
+	return skip;
+}
+
+/* parse_footnote_def • parse a single footnote definition */
+static void
+parse_footnote_def(hoedown_buffer *ob, hoedown_document *doc, unsigned int num, uint8_t *data, size_t size)
+{
+	hoedown_buffer *work = 0;
+	work = newbuf(doc, BUFFER_SPAN);
+
+	parse_block(work, doc, data, size);
+
+	if (doc->md.footnote_def)
+	doc->md.footnote_def(ob, work, num, &doc->data);
+	popbuf(doc, BUFFER_SPAN);
+}
+
+/* parse_footnote_list • render the contents of the footnotes */
+static void
+parse_footnote_list(hoedown_buffer *ob, hoedown_document *doc, struct footnote_list *footnotes)
+{
+	hoedown_buffer *work = 0;
+	struct footnote_item *item;
+	struct footnote_ref *ref;
+
+	if (footnotes->count == 0)
+		return;
+
+	work = newbuf(doc, BUFFER_BLOCK);
+
+	item = footnotes->head;
+	while (item) {
+		ref = item->ref;
+		parse_footnote_def(work, doc, ref->num, ref->contents->data, ref->contents->size);
+		item = item->next;
+	}
+
+	if (doc->md.footnotes)
+		doc->md.footnotes(ob, work, &doc->data);
+	popbuf(doc, BUFFER_BLOCK);
+}
+
+/* htmlblock_is_end • check for end of HTML block : </tag>( *)\n */
+/*	returns tag length on match, 0 otherwise */
+/*	assumes data starts with "<" */
+static size_t
+htmlblock_is_end(
+	const char *tag,
+	size_t tag_len,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size)
+{
+	size_t i = tag_len + 3, w;
+
+	/* try to match the end tag */
+	/* note: we're not considering tags like "</tag >" which are still valid */
+	if (i > size ||
+		data[1] != '/' ||
+		strncasecmp((char *)data + 2, tag, tag_len) != 0 ||
+		data[tag_len + 2] != '>')
+		return 0;
+
+	/* rest of the line must be empty */
+	if ((w = is_empty(data + i, size - i)) == 0 && i < size)
+		return 0;
+
+	return i + w;
+}
+
+/* htmlblock_find_end • try to find HTML block ending tag */
+/*	returns the length on match, 0 otherwise */
+static size_t
+htmlblock_find_end(
+	const char *tag,
+	size_t tag_len,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size)
+{
+	size_t i = 0, w;
+
+	while (1) {
+		while (i < size && data[i] != '<') i++;
+		if (i >= size) return 0;
+
+		w = htmlblock_is_end(tag, tag_len, doc, data + i, size - i);
+		if (w) return i + w;
+		i++;
+	}
+}
+
+/* htmlblock_find_end_strict • try to find end of HTML block in strict mode */
+/*	(it must be an unindented line, and have a blank line afterwads) */
+/*	returns the length on match, 0 otherwise */
+static size_t
+htmlblock_find_end_strict(
+	const char *tag,
+	size_t tag_len,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size)
+{
+	size_t i = 0, mark;
+
+	while (1) {
+		mark = i;
+		while (i < size && data[i] != '\n') i++;
+		if (i < size) i++;
+		if (i == mark) return 0;
+
+		if (data[mark] == ' ' && mark > 0) continue;
+		mark += htmlblock_find_end(tag, tag_len, doc, data + mark, i - mark);
+		if (mark == i && (is_empty(data + i, size - i) || i >= size)) break;
+	}
+
+	return i;
+}
+
+/* parse_htmlblock • parsing of inline HTML block */
+static size_t
+parse_htmlblock(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size, int do_render)
+{
+	hoedown_buffer work = { NULL, 0, 0, 0, NULL, NULL, NULL };
+	size_t i, j = 0, tag_len, tag_end;
+	const char *curtag = NULL;
+
+	work.data = data;
+
+	/* identification of the opening tag */
+	if (size < 2 || data[0] != '<')
+		return 0;
+
+	i = 1;
+	while (i < size && data[i] != '>' && data[i] != ' ')
+		i++;
+
+	if (i < size)
+		curtag = hoedown_find_block_tag((char *)data + 1, (int)i - 1);
+
+	/* handling of special cases */
+	if (!curtag) {
+
+		/* HTML comment, laxist form */
+		if (size > 5 && data[1] == '!' && data[2] == '-' && data[3] == '-') {
+			i = 5;
+
+			while (i < size && !(data[i - 2] == '-' && data[i - 1] == '-' && data[i] == '>'))
+				i++;
+
+			i++;
+
+			if (i < size)
+				j = is_empty(data + i, size - i);
+
+			if (j) {
+				work.size = i + j;
+				if (do_render && doc->md.blockhtml)
+					doc->md.blockhtml(ob, &work, &doc->data);
+				return work.size;
+			}
+		}
+
+		/* HR, which is the only self-closing block tag considered */
+		if (size > 4 && (data[1] == 'h' || data[1] == 'H') && (data[2] == 'r' || data[2] == 'R')) {
+			i = 3;
+			while (i < size && data[i] != '>')
+				i++;
+
+			if (i + 1 < size) {
+				i++;
+				j = is_empty(data + i, size - i);
+				if (j) {
+					work.size = i + j;
+					if (do_render && doc->md.blockhtml)
+						doc->md.blockhtml(ob, &work, &doc->data);
+					return work.size;
+				}
+			}
+		}
+
+		/* no special case recognised */
+		return 0;
+	}
+
+	/* looking for a matching closing tag in strict mode */
+	tag_len = strlen(curtag);
+	tag_end = htmlblock_find_end_strict(curtag, tag_len, doc, data, size);
+
+	/* if not found, trying a second pass looking for indented match */
+	/* but not if tag is "ins" or "del" (following original Markdown.pl) */
+	if (!tag_end && strcmp(curtag, "ins") != 0 && strcmp(curtag, "del") != 0)
+		tag_end = htmlblock_find_end(curtag, tag_len, doc, data, size);
+
+	if (!tag_end)
+		return 0;
+
+	/* the end of the block has been found */
+	work.size = tag_end;
+	if (do_render && doc->md.blockhtml)
+		doc->md.blockhtml(ob, &work, &doc->data);
+
+	return tag_end;
+}
+
+static void
+parse_table_row(
+	hoedown_buffer *ob,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size,
+	size_t columns,
+	hoedown_table_flags *col_data,
+	hoedown_table_flags header_flag)
+{
+	size_t i = 0, col, len;
+	hoedown_buffer *row_work = 0;
+
+	if (!doc->md.table_cell || !doc->md.table_row)
+		return;
+
+	row_work = newbuf(doc, BUFFER_SPAN);
+
+	if (i < size && data[i] == '|')
+		i++;
+
+	for (col = 0; col < columns && i < size; ++col) {
+		size_t cell_start, cell_end;
+		hoedown_buffer *cell_work;
+
+		cell_work = newbuf(doc, BUFFER_SPAN);
+
+		while (i < size && _isspace(data[i]))
+			i++;
+
+		cell_start = i;
+
+		len = find_emph_char(data + i, size - i, '|');
+		i += len ? len : size - i;
+
+		cell_end = i - 1;
+
+		while (cell_end > cell_start && _isspace(data[cell_end]))
+			cell_end--;
+
+		parse_inline(cell_work, doc, data + cell_start, 1 + cell_end - cell_start);
+		doc->md.table_cell(row_work, cell_work, col_data[col] | header_flag, &doc->data);
+
+		popbuf(doc, BUFFER_SPAN);
+		i++;
+	}
+
+	for (; col < columns; ++col) {
+		hoedown_buffer empty_cell = { 0, 0, 0, 0, NULL, NULL, NULL };
+		doc->md.table_cell(row_work, &empty_cell, col_data[col] | header_flag, &doc->data);
+	}
+
+	doc->md.table_row(ob, row_work, &doc->data);
+
+	popbuf(doc, BUFFER_SPAN);
+}
+
+static size_t
+parse_table_header(
+	hoedown_buffer *ob,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size,
+	size_t *columns,
+	hoedown_table_flags **column_data)
+{
+	int pipes;
+	size_t i = 0, col, header_end, under_end;
+
+	pipes = 0;
+	while (i < size && data[i] != '\n')
+		if (data[i++] == '|')
+			pipes++;
+
+	if (i == size || pipes == 0)
+		return 0;
+
+	header_end = i;
+
+	while (header_end > 0 && _isspace(data[header_end - 1]))
+		header_end--;
+
+	if (data[0] == '|')
+		pipes--;
+
+	if (header_end && data[header_end - 1] == '|')
+		pipes--;
+
+	if (pipes < 0)
+		return 0;
+
+	*columns = pipes + 1;
+	*column_data = hoedown_calloc(*columns, sizeof(hoedown_table_flags));
+
+	/* Parse the header underline */
+	i++;
+	if (i < size && data[i] == '|')
+		i++;
+
+	under_end = i;
+	while (under_end < size && data[under_end] != '\n')
+		under_end++;
+
+	for (col = 0; col < *columns && i < under_end; ++col) {
+		size_t dashes = 0;
+
+		while (i < under_end && data[i] == ' ')
+			i++;
+
+		if (data[i] == ':') {
+			i++; (*column_data)[col] |= HOEDOWN_TABLE_ALIGN_LEFT;
+			dashes++;
+		}
+
+		while (i < under_end && data[i] == '-') {
+			i++; dashes++;
+		}
+
+		if (i < under_end && data[i] == ':') {
+			i++; (*column_data)[col] |= HOEDOWN_TABLE_ALIGN_RIGHT;
+			dashes++;
+		}
+
+		while (i < under_end && data[i] == ' ')
+			i++;
+
+		if (i < under_end && data[i] != '|' && data[i] != '+')
+			break;
+
+		if (dashes < 3)
+			break;
+
+		i++;
+	}
+
+	if (col < *columns)
+		return 0;
+
+	parse_table_row(
+		ob, doc, data,
+		header_end,
+		*columns,
+		*column_data,
+		HOEDOWN_TABLE_HEADER
+	);
+
+	return under_end + 1;
+}
+
+static size_t
+parse_table(
+	hoedown_buffer *ob,
+	hoedown_document *doc,
+	uint8_t *data,
+	size_t size)
+{
+	size_t i;
+
+	hoedown_buffer *work = 0;
+	hoedown_buffer *header_work = 0;
+	hoedown_buffer *body_work = 0;
+
+	size_t columns;
+	hoedown_table_flags *col_data = NULL;
+
+	work = newbuf(doc, BUFFER_BLOCK);
+	header_work = newbuf(doc, BUFFER_SPAN);
+	body_work = newbuf(doc, BUFFER_BLOCK);
+
+	i = parse_table_header(header_work, doc, data, size, &columns, &col_data);
+	if (i > 0) {
+
+		while (i < size) {
+			size_t row_start;
+			int pipes = 0;
+
+			row_start = i;
+
+			while (i < size && data[i] != '\n')
+				if (data[i++] == '|')
+					pipes++;
+
+			if (pipes == 0 || i == size) {
+				i = row_start;
+				break;
+			}
+
+			parse_table_row(
+				body_work,
+				doc,
+				data + row_start,
+				i - row_start,
+				columns,
+				col_data, 0
+			);
+
+			i++;
+		}
+
+        if (doc->md.table_header)
+            doc->md.table_header(work, header_work, &doc->data);
+
+        if (doc->md.table_body)
+            doc->md.table_body(work, body_work, &doc->data);
+
+		if (doc->md.table)
+			doc->md.table(ob, work, &doc->data);
+	}
+
+	free(col_data);
+	popbuf(doc, BUFFER_SPAN);
+	popbuf(doc, BUFFER_BLOCK);
+	popbuf(doc, BUFFER_BLOCK);
+	return i;
+}
+
+/* parse_block • parsing of one block, returning next uint8_t to parse */
+static void
+parse_block(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t size)
+{
+	size_t beg, end, i;
+	uint8_t *txt_data;
+	beg = 0;
+
+	if (doc->work_bufs[BUFFER_SPAN].size +
+		doc->work_bufs[BUFFER_BLOCK].size > doc->max_nesting)
+		return;
+
+	while (beg < size) {
+		txt_data = data + beg;
+		end = size - beg;
+
+		if (is_atxheader(doc, txt_data, end))
+			beg += parse_atxheader(ob, doc, txt_data, end);
+
+		else if (data[beg] == '<' && doc->md.blockhtml &&
+				(i = parse_htmlblock(ob, doc, txt_data, end, 1)) != 0)
+			beg += i;
+
+		else if ((i = is_empty(txt_data, end)) != 0)
+			beg += i;
+
+		else if (is_hrule(txt_data, end)) {
+			if (doc->md.hrule)
+				doc->md.hrule(ob, &doc->data);
+
+			while (beg < size && data[beg] != '\n')
+				beg++;
+
+			beg++;
+		}
+
+		else if ((doc->ext_flags & HOEDOWN_EXT_FENCED_CODE) != 0 &&
+			(i = parse_fencedcode(ob, doc, txt_data, end)) != 0)
+			beg += i;
+
+		else if ((doc->ext_flags & HOEDOWN_EXT_TABLES) != 0 &&
+			(i = parse_table(ob, doc, txt_data, end)) != 0)
+			beg += i;
+
+		else if (prefix_quote(txt_data, end))
+			beg += parse_blockquote(ob, doc, txt_data, end);
+
+		else if (!(doc->ext_flags & HOEDOWN_EXT_DISABLE_INDENTED_CODE) && prefix_code(txt_data, end))
+			beg += parse_blockcode(ob, doc, txt_data, end);
+
+		else if (prefix_uli(txt_data, end))
+			beg += parse_list(ob, doc, txt_data, end, 0);
+
+		else if (prefix_oli(txt_data, end))
+			beg += parse_list(ob, doc, txt_data, end, HOEDOWN_LIST_ORDERED);
+
+		else
+			beg += parse_paragraph(ob, doc, txt_data, end);
+	}
+}
+
+
+
+/*********************
+ * REFERENCE PARSING *
+ *********************/
+
+/* is_footnote • returns whether a line is a footnote definition or not */
+static int
+is_footnote(const uint8_t *data, size_t beg, size_t end, size_t *last, struct footnote_list *list)
+{
+	size_t i = 0;
+	hoedown_buffer *contents = 0;
+	size_t ind = 0;
+	int in_empty = 0;
+	size_t start = 0;
+
+	size_t id_offset, id_end;
+
+	/* up to 3 optional leading spaces */
+	if (beg + 3 >= end) return 0;
+	if (data[beg] == ' ') { i = 1;
+	if (data[beg + 1] == ' ') { i = 2;
+	if (data[beg + 2] == ' ') { i = 3;
+	if (data[beg + 3] == ' ') return 0; } } }
+	i += beg;
+
+	/* id part: caret followed by anything between brackets */
+	if (data[i] != '[') return 0;
+	i++;
+	if (i >= end || data[i] != '^') return 0;
+	i++;
+	id_offset = i;
+	while (i < end && data[i] != '\n' && data[i] != '\r' && data[i] != ']')
+		i++;
+	if (i >= end || data[i] != ']') return 0;
+	id_end = i;
+
+	/* spacer: colon (space | tab)* newline? (space | tab)* */
+	i++;
+	if (i >= end || data[i] != ':') return 0;
+	i++;
+
+	/* getting content buffer */
+	contents = hoedown_buffer_new(64);
+
+	start = i;
+
+	/* process lines similar to a list item */
+	while (i < end) {
+		while (i < end && data[i] != '\n' && data[i] != '\r') i++;
+
+		/* process an empty line */
+		if (is_empty(data + start, i - start)) {
+			in_empty = 1;
+			if (i < end && (data[i] == '\n' || data[i] == '\r')) {
+				i++;
+				if (i < end && data[i] == '\n' && data[i - 1] == '\r') i++;
+			}
+			start = i;
+			continue;
+		}
+
+		/* calculating the indentation */
+		ind = 0;
+		while (ind < 4 && start + ind < end && data[start + ind] == ' ')
+			ind++;
+
+		/* joining only indented stuff after empty lines;
+		 * note that now we only require 1 space of indentation
+		 * to continue, just like lists */
+		if (ind == 0) {
+			if (start == id_end + 2 && data[start] == '\t') {}
+			else break;
+		}
+		else if (in_empty) {
+			hoedown_buffer_putc(contents, '\n');
+		}
+
+		in_empty = 0;
+
+		/* adding the line into the content buffer */
+		hoedown_buffer_put(contents, data + start + ind, i - start - ind);
+		/* add carriage return */
+		if (i < end) {
+			hoedown_buffer_putc(contents, '\n');
+			if (i < end && (data[i] == '\n' || data[i] == '\r')) {
+				i++;
+				if (i < end && data[i] == '\n' && data[i - 1] == '\r') i++;
+			}
+		}
+		start = i;
+	}
+
+	if (last)
+		*last = start;
+
+	if (list) {
+		struct footnote_ref *ref;
+		ref = create_footnote_ref(list, data + id_offset, id_end - id_offset);
+		if (!ref)
+			return 0;
+		if (!add_footnote_ref(list, ref)) {
+			free_footnote_ref(ref);
+			return 0;
+		}
+		ref->contents = contents;
+	}
+
+	return 1;
+}
+
+/* is_ref • returns whether a line is a reference or not */
+static int
+is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_ref **refs)
+{
+/*	int n; */
+	size_t i = 0;
+	size_t id_offset, id_end;
+	size_t link_offset, link_end;
+	size_t title_offset, title_end;
+	size_t line_end;
+
+	/* up to 3 optional leading spaces */
+	if (beg + 3 >= end) return 0;
+	if (data[beg] == ' ') { i = 1;
+	if (data[beg + 1] == ' ') { i = 2;
+	if (data[beg + 2] == ' ') { i = 3;
+	if (data[beg + 3] == ' ') return 0; } } }
+	i += beg;
+
+	/* id part: anything but a newline between brackets */
+	if (data[i] != '[') return 0;
+	i++;
+	id_offset = i;
+	while (i < end && data[i] != '\n' && data[i] != '\r' && data[i] != ']')
+		i++;
+	if (i >= end || data[i] != ']') return 0;
+	id_end = i;
+
+	/* spacer: colon (space | tab)* newline? (space | tab)* */
+	i++;
+	if (i >= end || data[i] != ':') return 0;
+	i++;
+	while (i < end && data[i] == ' ') i++;
+	if (i < end && (data[i] == '\n' || data[i] == '\r')) {
+		i++;
+		if (i < end && data[i] == '\r' && data[i - 1] == '\n') i++; }
+	while (i < end && data[i] == ' ') i++;
+	if (i >= end) return 0;
+
+	/* link: spacing-free sequence, optionally between angle brackets */
+	if (data[i] == '<')
+		i++;
+
+	link_offset = i;
+
+	while (i < end && data[i] != ' ' && data[i] != '\n' && data[i] != '\r')
+		i++;
+
+	if (data[i - 1] == '>') link_end = i - 1;
+	else link_end = i;
+
+	/* optional spacer: (space | tab)* (newline | '\'' | '"' | '(' ) */
+	while (i < end && data[i] == ' ') i++;
+	if (i < end && data[i] != '\n' && data[i] != '\r'
+			&& data[i] != '\'' && data[i] != '"' && data[i] != '(')
+		return 0;
+	line_end = 0;
+	/* computing end-of-line */
+	if (i >= end || data[i] == '\r' || data[i] == '\n') line_end = i;
+	if (i + 1 < end && data[i] == '\n' && data[i + 1] == '\r')
+		line_end = i + 1;
+
+	/* optional (space|tab)* spacer after a newline */
+	if (line_end) {
+		i = line_end + 1;
+		while (i < end && data[i] == ' ') i++; }
+
+	/* optional title: any non-newline sequence enclosed in '"()
+					alone on its line */
+	title_offset = title_end = 0;
+	if (i + 1 < end
+	&& (data[i] == '\'' || data[i] == '"' || data[i] == '(')) {
+		i++;
+		title_offset = i;
+		/* looking for EOL */
+		while (i < end && data[i] != '\n' && data[i] != '\r') i++;
+		if (i + 1 < end && data[i] == '\n' && data[i + 1] == '\r')
+			title_end = i + 1;
+		else	title_end = i;
+		/* stepping back */
+		i -= 1;
+		while (i > title_offset && data[i] == ' ')
+			i -= 1;
+		if (i > title_offset
+		&& (data[i] == '\'' || data[i] == '"' || data[i] == ')')) {
+			line_end = title_end;
+			title_end = i; } }
+
+	if (!line_end || link_end == link_offset)
+		return 0; /* garbage after the link empty link */
+
+	/* a valid ref has been found, filling-in return structures */
+	if (last)
+		*last = line_end;
+
+	if (refs) {
+		struct link_ref *ref;
+
+		ref = add_link_ref(refs, data + id_offset, id_end - id_offset);
+		if (!ref)
+			return 0;
+
+		ref->link = hoedown_buffer_new(link_end - link_offset);
+		hoedown_buffer_put(ref->link, data + link_offset, link_end - link_offset);
+
+		if (title_end > title_offset) {
+			ref->title = hoedown_buffer_new(title_end - title_offset);
+			hoedown_buffer_put(ref->title, data + title_offset, title_end - title_offset);
+		}
+	}
+
+	return 1;
+}
+
+static void expand_tabs(hoedown_buffer *ob, const uint8_t *line, size_t size)
+{
+	/* This code makes two assumptions:
+	 * - Input is valid UTF-8.  (Any byte with top two bits 10 is skipped,
+	 *   whether or not it is a valid UTF-8 continuation byte.)
+	 * - Input contains no combining characters.  (Combining characters
+	 *   should be skipped but are not.)
+	 */
+	size_t  i = 0, tab = 0;
+
+	while (i < size) {
+		size_t org = i;
+
+		while (i < size && line[i] != '\t') {
+			/* ignore UTF-8 continuation bytes */
+			if ((line[i] & 0xc0) != 0x80)
+				tab++;
+			i++;
+		}
+
+		if (i > org)
+			hoedown_buffer_put(ob, line + org, i - org);
+
+		if (i >= size)
+			break;
+
+		do {
+			hoedown_buffer_putc(ob, ' '); tab++;
+		} while (tab % 4);
+
+		i++;
+	}
+}
+
+/**********************
+ * EXPORTED FUNCTIONS *
+ **********************/
+
+hoedown_document *
+hoedown_document_new(
+	const hoedown_renderer *renderer,
+	hoedown_extensions extensions,
+	size_t max_nesting)
+{
+	hoedown_document *doc = NULL;
+
+	assert(max_nesting > 0 && renderer);
+
+	doc = hoedown_malloc(sizeof(hoedown_document));
+	memcpy(&doc->md, renderer, sizeof(hoedown_renderer));
+
+	doc->data.opaque = renderer->opaque;
+
+	hoedown_stack_init(&doc->work_bufs[BUFFER_BLOCK], 4);
+	hoedown_stack_init(&doc->work_bufs[BUFFER_SPAN], 8);
+
+	memset(doc->active_char, 0x0, 256);
+
+	if (extensions & HOEDOWN_EXT_UNDERLINE && doc->md.underline) {
+		doc->active_char['_'] = MD_CHAR_EMPHASIS;
+	}
+
+	if (doc->md.emphasis || doc->md.double_emphasis || doc->md.triple_emphasis) {
+		doc->active_char['*'] = MD_CHAR_EMPHASIS;
+		doc->active_char['_'] = MD_CHAR_EMPHASIS;
+		if (extensions & HOEDOWN_EXT_STRIKETHROUGH)
+			doc->active_char['~'] = MD_CHAR_EMPHASIS;
+		if (extensions & HOEDOWN_EXT_HIGHLIGHT)
+			doc->active_char['='] = MD_CHAR_EMPHASIS;
+	}
+
+	if (doc->md.codespan)
+		doc->active_char['`'] = MD_CHAR_CODESPAN;
+
+	if (doc->md.linebreak)
+		doc->active_char['\n'] = MD_CHAR_LINEBREAK;
+
+	if (doc->md.image || doc->md.link || doc->md.footnotes || doc->md.footnote_ref)
+		doc->active_char['['] = MD_CHAR_LINK;
+
+	doc->active_char['<'] = MD_CHAR_LANGLE;
+	doc->active_char['\\'] = MD_CHAR_ESCAPE;
+	doc->active_char['&'] = MD_CHAR_ENTITY;
+
+	if (extensions & HOEDOWN_EXT_AUTOLINK) {
+		doc->active_char[':'] = MD_CHAR_AUTOLINK_URL;
+		doc->active_char['@'] = MD_CHAR_AUTOLINK_EMAIL;
+		doc->active_char['w'] = MD_CHAR_AUTOLINK_WWW;
+	}
+
+	if (extensions & HOEDOWN_EXT_SUPERSCRIPT)
+		doc->active_char['^'] = MD_CHAR_SUPERSCRIPT;
+
+	if (extensions & HOEDOWN_EXT_QUOTE)
+		doc->active_char['"'] = MD_CHAR_QUOTE;
+
+	if (extensions & HOEDOWN_EXT_MATH)
+		doc->active_char['$'] = MD_CHAR_MATH;
+
+	/* Extension data */
+	doc->ext_flags = extensions;
+	doc->max_nesting = max_nesting;
+	doc->in_link_body = 0;
+
+	return doc;
+}
+
+void
+hoedown_document_render(hoedown_document *doc, hoedown_buffer *ob, const uint8_t *data, size_t size)
+{
+	static const uint8_t UTF8_BOM[] = {0xEF, 0xBB, 0xBF};
+
+	hoedown_buffer *text;
+	size_t beg, end;
+
+	int footnotes_enabled;
+
+	text = hoedown_buffer_new(64);
+
+	/* Preallocate enough space for our buffer to avoid expanding while copying */
+	hoedown_buffer_grow(text, size);
+
+	/* reset the references table */
+	memset(&doc->refs, 0x0, REF_TABLE_SIZE * sizeof(void *));
+
+	footnotes_enabled = doc->ext_flags & HOEDOWN_EXT_FOOTNOTES;
+
+	/* reset the footnotes lists */
+	if (footnotes_enabled) {
+		memset(&doc->footnotes_found, 0x0, sizeof(doc->footnotes_found));
+		memset(&doc->footnotes_used, 0x0, sizeof(doc->footnotes_used));
+	}
+
+	/* first pass: looking for references, copying everything else */
+	beg = 0;
+
+	/* Skip a possible UTF-8 BOM, even though the Unicode standard
+	 * discourages having these in UTF-8 documents */
+	if (size >= 3 && memcmp(data, UTF8_BOM, 3) == 0)
+		beg += 3;
+
+	while (beg < size) /* iterating over lines */
+		if (footnotes_enabled && is_footnote(data, beg, size, &end, &doc->footnotes_found))
+			beg = end;
+		else if (is_ref(data, beg, size, &end, doc->refs))
+			beg = end;
+		else { /* skipping to the next line */
+			end = beg;
+			while (end < size && data[end] != '\n' && data[end] != '\r')
+				end++;
+
+			/* adding the line body if present */
+			if (end > beg)
+				expand_tabs(text, data + beg, end - beg);
+
+			while (end < size && (data[end] == '\n' || data[end] == '\r')) {
+				/* add one \n per newline */
+				if (data[end] == '\n' || (end + 1 < size && data[end + 1] != '\n'))
+					hoedown_buffer_putc(text, '\n');
+				end++;
+			}
+
+			beg = end;
+		}
+
+	/* pre-grow the output buffer to minimize allocations */
+	hoedown_buffer_grow(ob, text->size + (text->size >> 1));
+
+	/* second pass: actual rendering */
+	if (doc->md.doc_header)
+		doc->md.doc_header(ob, 0, &doc->data);
+
+	if (text->size) {
+		/* adding a final newline if not already present */
+		if (text->data[text->size - 1] != '\n' &&  text->data[text->size - 1] != '\r')
+			hoedown_buffer_putc(text, '\n');
+
+		parse_block(ob, doc, text->data, text->size);
+	}
+
+	/* footnotes */
+	if (footnotes_enabled)
+		parse_footnote_list(ob, doc, &doc->footnotes_used);
+
+	if (doc->md.doc_footer)
+		doc->md.doc_footer(ob, 0, &doc->data);
+
+	/* clean-up */
+	hoedown_buffer_free(text);
+	free_link_refs(doc->refs);
+	if (footnotes_enabled) {
+		free_footnote_list(&doc->footnotes_found, 1);
+		free_footnote_list(&doc->footnotes_used, 0);
+	}
+
+	assert(doc->work_bufs[BUFFER_SPAN].size == 0);
+	assert(doc->work_bufs[BUFFER_BLOCK].size == 0);
+}
+
+void
+hoedown_document_render_inline(hoedown_document *doc, hoedown_buffer *ob, const uint8_t *data, size_t size)
+{
+	size_t i = 0, mark;
+	hoedown_buffer *text = hoedown_buffer_new(64);
+
+	/* reset the references table */
+	memset(&doc->refs, 0x0, REF_TABLE_SIZE * sizeof(void *));
+
+	/* first pass: expand tabs and process newlines */
+	hoedown_buffer_grow(text, size);
+	while (1) {
+		mark = i;
+		while (i < size && data[i] != '\n' && data[i] != '\r')
+			i++;
+
+		expand_tabs(text, data + mark, i - mark);
+
+		if (i >= size)
+			break;
+
+		while (i < size && (data[i] == '\n' || data[i] == '\r')) {
+			/* add one \n per newline */
+			if (data[i] == '\n' || (i + 1 < size && data[i + 1] != '\n'))
+				hoedown_buffer_putc(text, '\n');
+			i++;
+		}
+	}
+
+	/* second pass: actual rendering */
+	hoedown_buffer_grow(ob, text->size + (text->size >> 1));
+
+	if (doc->md.doc_header)
+		doc->md.doc_header(ob, 1, &doc->data);
+
+	parse_inline(ob, doc, text->data, text->size);
+
+	if (doc->md.doc_footer)
+		doc->md.doc_footer(ob, 1, &doc->data);
+
+	/* clean-up */
+	hoedown_buffer_free(text);
+
+	assert(doc->work_bufs[BUFFER_SPAN].size == 0);
+	assert(doc->work_bufs[BUFFER_BLOCK].size == 0);
+}
+
+void
+hoedown_document_free(hoedown_document *doc)
+{
+	size_t i;
+
+	for (i = 0; i < (size_t)doc->work_bufs[BUFFER_SPAN].asize; ++i)
+		hoedown_buffer_free(doc->work_bufs[BUFFER_SPAN].item[i]);
+
+	for (i = 0; i < (size_t)doc->work_bufs[BUFFER_BLOCK].asize; ++i)
+		hoedown_buffer_free(doc->work_bufs[BUFFER_BLOCK].item[i]);
+
+	hoedown_stack_uninit(&doc->work_bufs[BUFFER_SPAN]);
+	hoedown_stack_uninit(&doc->work_bufs[BUFFER_BLOCK]);
+
+	free(doc);
+}
diff --git a/libraries/hoedown/src/escape.c b/libraries/hoedown/src/escape.c
new file mode 100644
index 00000000..b4a275ba
--- /dev/null
+++ b/libraries/hoedown/src/escape.c
@@ -0,0 +1,188 @@
+#include "hoedown/escape.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+
+#define likely(x)       __builtin_expect((x),1)
+#define unlikely(x)     __builtin_expect((x),0)
+
+
+/*
+ * The following characters will not be escaped:
+ *
+ *		-_.+!*'(),%#@?=;:/,+&$ alphanum
+ *
+ * Note that this character set is the addition of:
+ *
+ *	- The characters which are safe to be in an URL
+ *	- The characters which are *not* safe to be in
+ *	an URL because they are RESERVED characters.
+ *
+ * We assume (lazily) that any RESERVED char that
+ * appears inside an URL is actually meant to
+ * have its native function (i.e. as an URL
+ * component/separator) and hence needs no escaping.
+ *
+ * There are two exceptions: the chacters & (amp)
+ * and ' (single quote) do not appear in the table.
+ * They are meant to appear in the URL as components,
+ * yet they require special HTML-entity escaping
+ * to generate valid HTML markup.
+ *
+ * All other characters will be escaped to %XX.
+ *
+ */
+static const uint8_t HREF_SAFE[UINT8_MAX+1] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,
+	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+void
+hoedown_escape_href(hoedown_buffer *ob, const uint8_t *data, size_t size)
+{
+	static const char hex_chars[] = "0123456789ABCDEF";
+	size_t  i = 0, mark;
+	char hex_str[3];
+
+	hex_str[0] = '%';
+
+	while (i < size) {
+		mark = i;
+		while (i < size && HREF_SAFE[data[i]]) i++;
+
+		/* Optimization for cases where there's nothing to escape */
+		if (mark == 0 && i >= size) {
+			hoedown_buffer_put(ob, data, size);
+			return;
+		}
+
+		if (likely(i > mark)) {
+			hoedown_buffer_put(ob, data + mark, i - mark);
+		}
+
+		/* escaping */
+		if (i >= size)
+			break;
+
+		switch (data[i]) {
+		/* amp appears all the time in URLs, but needs
+		 * HTML-entity escaping to be inside an href */
+		case '&':
+			HOEDOWN_BUFPUTSL(ob, "&amp;");
+			break;
+
+		/* the single quote is a valid URL character
+		 * according to the standard; it needs HTML
+		 * entity escaping too */
+		case '\'':
+			HOEDOWN_BUFPUTSL(ob, "&#x27;");
+			break;
+
+		/* the space can be escaped to %20 or a plus
+		 * sign. we're going with the generic escape
+		 * for now. the plus thing is more commonly seen
+		 * when building GET strings */
+#if 0
+		case ' ':
+			hoedown_buffer_putc(ob, '+');
+			break;
+#endif
+
+		/* every other character goes with a %XX escaping */
+		default:
+			hex_str[1] = hex_chars[(data[i] >> 4) & 0xF];
+			hex_str[2] = hex_chars[data[i] & 0xF];
+			hoedown_buffer_put(ob, (uint8_t *)hex_str, 3);
+		}
+
+		i++;
+	}
+}
+
+
+/**
+ * According to the OWASP rules:
+ *
+ * & --> &amp;
+ * < --> &lt;
+ * > --> &gt;
+ * " --> &quot;
+ * ' --> &#x27;     &apos; is not recommended
+ * / --> &#x2F;     forward slash is included as it helps end an HTML entity
+ *
+ */
+static const uint8_t HTML_ESCAPE_TABLE[UINT8_MAX+1] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 4,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 6, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const char *HTML_ESCAPES[] = {
+        "",
+        "&quot;",
+        "&amp;",
+        "&#39;",
+        "&#47;",
+        "&lt;",
+        "&gt;"
+};
+
+void
+hoedown_escape_html(hoedown_buffer *ob, const uint8_t *data, size_t size, int secure)
+{
+	size_t i = 0, mark;
+
+	while (1) {
+		mark = i;
+		while (i < size && HTML_ESCAPE_TABLE[data[i]] == 0) i++;
+
+		/* Optimization for cases where there's nothing to escape */
+		if (mark == 0 && i >= size) {
+			hoedown_buffer_put(ob, data, size);
+			return;
+		}
+
+		if (likely(i > mark))
+			hoedown_buffer_put(ob, data + mark, i - mark);
+
+		if (i >= size) break;
+
+		/* The forward slash is only escaped in secure mode */
+		if (!secure && data[i] == '/') {
+			hoedown_buffer_putc(ob, '/');
+		} else {
+			hoedown_buffer_puts(ob, HTML_ESCAPES[HTML_ESCAPE_TABLE[data[i]]]);
+		}
+
+		i++;
+	}
+}
diff --git a/libraries/hoedown/src/html.c b/libraries/hoedown/src/html.c
new file mode 100644
index 00000000..4b18d804
--- /dev/null
+++ b/libraries/hoedown/src/html.c
@@ -0,0 +1,754 @@
+#include "hoedown/html.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#include "hoedown/escape.h"
+
+#define USE_XHTML(opt) (opt->flags & HOEDOWN_HTML_USE_XHTML)
+
+hoedown_html_tag
+hoedown_html_is_tag(const uint8_t *data, size_t size, const char *tagname)
+{
+	size_t i;
+	int closed = 0;
+
+	if (size < 3 || data[0] != '<')
+		return HOEDOWN_HTML_TAG_NONE;
+
+	i = 1;
+
+	if (data[i] == '/') {
+		closed = 1;
+		i++;
+	}
+
+	for (; i < size; ++i, ++tagname) {
+		if (*tagname == 0)
+			break;
+
+		if (data[i] != *tagname)
+			return HOEDOWN_HTML_TAG_NONE;
+	}
+
+	if (i == size)
+		return HOEDOWN_HTML_TAG_NONE;
+
+	if (isspace(data[i]) || data[i] == '>')
+		return closed ? HOEDOWN_HTML_TAG_CLOSE : HOEDOWN_HTML_TAG_OPEN;
+
+	return HOEDOWN_HTML_TAG_NONE;
+}
+
+static void escape_html(hoedown_buffer *ob, const uint8_t *source, size_t length)
+{
+	hoedown_escape_html(ob, source, length, 0);
+}
+
+static void escape_href(hoedown_buffer *ob, const uint8_t *source, size_t length)
+{
+	hoedown_escape_href(ob, source, length);
+}
+
+/********************
+ * GENERIC RENDERER *
+ ********************/
+static int
+rndr_autolink(hoedown_buffer *ob, const hoedown_buffer *link, hoedown_autolink_type type, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	if (!link || !link->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<a href=\"");
+	if (type == HOEDOWN_AUTOLINK_EMAIL)
+		HOEDOWN_BUFPUTSL(ob, "mailto:");
+	escape_href(ob, link->data, link->size);
+
+	if (state->link_attributes) {
+		hoedown_buffer_putc(ob, '\"');
+		state->link_attributes(ob, link, data);
+		hoedown_buffer_putc(ob, '>');
+	} else {
+		HOEDOWN_BUFPUTSL(ob, "\">");
+	}
+
+	/*
+	 * Pretty printing: if we get an email address as
+	 * an actual URI, e.g. `mailto:foo@bar.com`, we don't
+	 * want to print the `mailto:` prefix
+	 */
+	if (hoedown_buffer_prefix(link, "mailto:") == 0) {
+		escape_html(ob, link->data + 7, link->size - 7);
+	} else {
+		escape_html(ob, link->data, link->size);
+	}
+
+	HOEDOWN_BUFPUTSL(ob, "</a>");
+
+	return 1;
+}
+
+static void
+rndr_blockcode(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_buffer *lang, const hoedown_renderer_data *data)
+{
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+
+	if (lang) {
+		HOEDOWN_BUFPUTSL(ob, "<pre><code class=\"language-");
+		escape_html(ob, lang->data, lang->size);
+		HOEDOWN_BUFPUTSL(ob, "\">");
+	} else {
+		HOEDOWN_BUFPUTSL(ob, "<pre><code>");
+	}
+
+	if (text)
+		escape_html(ob, text->data, text->size);
+
+	HOEDOWN_BUFPUTSL(ob, "</code></pre>\n");
+}
+
+static void
+rndr_blockquote(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+	HOEDOWN_BUFPUTSL(ob, "<blockquote>\n");
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</blockquote>\n");
+}
+
+static int
+rndr_codespan(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data)
+{
+	HOEDOWN_BUFPUTSL(ob, "<code>");
+	if (text) escape_html(ob, text->data, text->size);
+	HOEDOWN_BUFPUTSL(ob, "</code>");
+	return 1;
+}
+
+static int
+rndr_strikethrough(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<del>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</del>");
+	return 1;
+}
+
+static int
+rndr_double_emphasis(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<strong>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</strong>");
+
+	return 1;
+}
+
+static int
+rndr_emphasis(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size) return 0;
+	HOEDOWN_BUFPUTSL(ob, "<em>");
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</em>");
+	return 1;
+}
+
+static int
+rndr_underline(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<u>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</u>");
+
+	return 1;
+}
+
+static int
+rndr_highlight(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<mark>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</mark>");
+
+	return 1;
+}
+
+static int
+rndr_quote(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size)
+		return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<q>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</q>");
+
+	return 1;
+}
+
+static int
+rndr_linebreak(hoedown_buffer *ob, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+	hoedown_buffer_puts(ob, USE_XHTML(state) ? "<br/>\n" : "<br>\n");
+	return 1;
+}
+
+static void
+rndr_header(hoedown_buffer *ob, const hoedown_buffer *content, int level, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	if (ob->size)
+		hoedown_buffer_putc(ob, '\n');
+
+	if (level <= state->toc_data.nesting_level)
+		hoedown_buffer_printf(ob, "<h%d id=\"toc_%d\">", level, state->toc_data.header_count++);
+	else
+		hoedown_buffer_printf(ob, "<h%d>", level);
+
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+	hoedown_buffer_printf(ob, "</h%d>\n", level);
+}
+
+static int
+rndr_link(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_buffer *link, const hoedown_buffer *title, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	HOEDOWN_BUFPUTSL(ob, "<a href=\"");
+
+	if (link && link->size)
+		escape_href(ob, link->data, link->size);
+
+	if (title && title->size) {
+		HOEDOWN_BUFPUTSL(ob, "\" title=\"");
+		escape_html(ob, title->data, title->size);
+	}
+
+	if (state->link_attributes) {
+		hoedown_buffer_putc(ob, '\"');
+		state->link_attributes(ob, link, data);
+		hoedown_buffer_putc(ob, '>');
+	} else {
+		HOEDOWN_BUFPUTSL(ob, "\">");
+	}
+
+	if (content && content->size) hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</a>");
+	return 1;
+}
+
+static void
+rndr_list(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_list_flags flags, const hoedown_renderer_data *data)
+{
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+	hoedown_buffer_put(ob, (const uint8_t *)(flags & HOEDOWN_LIST_ORDERED ? "<ol>\n" : "<ul>\n"), 5);
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+	hoedown_buffer_put(ob, (const uint8_t *)(flags & HOEDOWN_LIST_ORDERED ? "</ol>\n" : "</ul>\n"), 6);
+}
+
+static void
+rndr_listitem(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_list_flags flags, const hoedown_renderer_data *data)
+{
+	HOEDOWN_BUFPUTSL(ob, "<li>");
+	if (content) {
+		size_t size = content->size;
+		while (size && content->data[size - 1] == '\n')
+			size--;
+
+		hoedown_buffer_put(ob, content->data, size);
+	}
+	HOEDOWN_BUFPUTSL(ob, "</li>\n");
+}
+
+static void
+rndr_paragraph(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+	size_t i = 0;
+
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+
+	if (!content || !content->size)
+		return;
+
+	while (i < content->size && isspace(content->data[i])) i++;
+
+	if (i == content->size)
+		return;
+
+	HOEDOWN_BUFPUTSL(ob, "<p>");
+	if (state->flags & HOEDOWN_HTML_HARD_WRAP) {
+		size_t org;
+		while (i < content->size) {
+			org = i;
+			while (i < content->size && content->data[i] != '\n')
+				i++;
+
+			if (i > org)
+				hoedown_buffer_put(ob, content->data + org, i - org);
+
+			/*
+			 * do not insert a line break if this newline
+			 * is the last character on the paragraph
+			 */
+			if (i >= content->size - 1)
+				break;
+
+			rndr_linebreak(ob, data);
+			i++;
+		}
+	} else {
+		hoedown_buffer_put(ob, content->data + i, content->size - i);
+	}
+	HOEDOWN_BUFPUTSL(ob, "</p>\n");
+}
+
+static void
+rndr_raw_block(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data)
+{
+	size_t org, sz;
+
+	if (!text)
+		return;
+
+	/* FIXME: Do we *really* need to trim the HTML? How does that make a difference? */
+	sz = text->size;
+	while (sz > 0 && text->data[sz - 1] == '\n')
+		sz--;
+
+	org = 0;
+	while (org < sz && text->data[org] == '\n')
+		org++;
+
+	if (org >= sz)
+		return;
+
+	if (ob->size)
+		hoedown_buffer_putc(ob, '\n');
+
+	hoedown_buffer_put(ob, text->data + org, sz - org);
+	hoedown_buffer_putc(ob, '\n');
+}
+
+static int
+rndr_triple_emphasis(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size) return 0;
+	HOEDOWN_BUFPUTSL(ob, "<strong><em>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</em></strong>");
+	return 1;
+}
+
+static void
+rndr_hrule(hoedown_buffer *ob, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+	hoedown_buffer_puts(ob, USE_XHTML(state) ? "<hr/>\n" : "<hr>\n");
+}
+
+static int
+rndr_image(hoedown_buffer *ob, const hoedown_buffer *link, const hoedown_buffer *title, const hoedown_buffer *alt, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+	if (!link || !link->size) return 0;
+
+	HOEDOWN_BUFPUTSL(ob, "<img src=\"");
+	escape_href(ob, link->data, link->size);
+	HOEDOWN_BUFPUTSL(ob, "\" alt=\"");
+
+	if (alt && alt->size)
+		escape_html(ob, alt->data, alt->size);
+
+	if (title && title->size) {
+		HOEDOWN_BUFPUTSL(ob, "\" title=\"");
+		escape_html(ob, title->data, title->size); }
+
+	hoedown_buffer_puts(ob, USE_XHTML(state) ? "\"/>" : "\">");
+	return 1;
+}
+
+static int
+rndr_raw_html(hoedown_buffer *ob, const hoedown_buffer *text, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	/* ESCAPE overrides SKIP_HTML. It doesn't look to see if
+	 * there are any valid tags, just escapes all of them. */
+	if((state->flags & HOEDOWN_HTML_ESCAPE) != 0) {
+		escape_html(ob, text->data, text->size);
+		return 1;
+	}
+
+	if ((state->flags & HOEDOWN_HTML_SKIP_HTML) != 0)
+		return 1;
+
+	hoedown_buffer_put(ob, text->data, text->size);
+	return 1;
+}
+
+static void
+rndr_table(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+    if (ob->size) hoedown_buffer_putc(ob, '\n');
+    HOEDOWN_BUFPUTSL(ob, "<table>\n");
+    hoedown_buffer_put(ob, content->data, content->size);
+    HOEDOWN_BUFPUTSL(ob, "</table>\n");
+}
+
+static void
+rndr_table_header(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+    if (ob->size) hoedown_buffer_putc(ob, '\n');
+    HOEDOWN_BUFPUTSL(ob, "<thead>\n");
+    hoedown_buffer_put(ob, content->data, content->size);
+    HOEDOWN_BUFPUTSL(ob, "</thead>\n");
+}
+
+static void
+rndr_table_body(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+    if (ob->size) hoedown_buffer_putc(ob, '\n');
+    HOEDOWN_BUFPUTSL(ob, "<tbody>\n");
+    hoedown_buffer_put(ob, content->data, content->size);
+    HOEDOWN_BUFPUTSL(ob, "</tbody>\n");
+}
+
+static void
+rndr_tablerow(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	HOEDOWN_BUFPUTSL(ob, "<tr>\n");
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</tr>\n");
+}
+
+static void
+rndr_tablecell(hoedown_buffer *ob, const hoedown_buffer *content, hoedown_table_flags flags, const hoedown_renderer_data *data)
+{
+	if (flags & HOEDOWN_TABLE_HEADER) {
+		HOEDOWN_BUFPUTSL(ob, "<th");
+	} else {
+		HOEDOWN_BUFPUTSL(ob, "<td");
+	}
+
+	switch (flags & HOEDOWN_TABLE_ALIGNMASK) {
+	case HOEDOWN_TABLE_ALIGN_CENTER:
+		HOEDOWN_BUFPUTSL(ob, " style=\"text-align: center\">");
+		break;
+
+	case HOEDOWN_TABLE_ALIGN_LEFT:
+		HOEDOWN_BUFPUTSL(ob, " style=\"text-align: left\">");
+		break;
+
+	case HOEDOWN_TABLE_ALIGN_RIGHT:
+		HOEDOWN_BUFPUTSL(ob, " style=\"text-align: right\">");
+		break;
+
+	default:
+		HOEDOWN_BUFPUTSL(ob, ">");
+	}
+
+	if (content)
+		hoedown_buffer_put(ob, content->data, content->size);
+
+	if (flags & HOEDOWN_TABLE_HEADER) {
+		HOEDOWN_BUFPUTSL(ob, "</th>\n");
+	} else {
+		HOEDOWN_BUFPUTSL(ob, "</td>\n");
+	}
+}
+
+static int
+rndr_superscript(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (!content || !content->size) return 0;
+	HOEDOWN_BUFPUTSL(ob, "<sup>");
+	hoedown_buffer_put(ob, content->data, content->size);
+	HOEDOWN_BUFPUTSL(ob, "</sup>");
+	return 1;
+}
+
+static void
+rndr_normal_text(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	if (content)
+		escape_html(ob, content->data, content->size);
+}
+
+static void
+rndr_footnotes(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	if (ob->size) hoedown_buffer_putc(ob, '\n');
+	HOEDOWN_BUFPUTSL(ob, "<div class=\"footnotes\">\n");
+	hoedown_buffer_puts(ob, USE_XHTML(state) ? "<hr/>\n" : "<hr>\n");
+	HOEDOWN_BUFPUTSL(ob, "<ol>\n");
+
+	if (content) hoedown_buffer_put(ob, content->data, content->size);
+
+	HOEDOWN_BUFPUTSL(ob, "\n</ol>\n</div>\n");
+}
+
+static void
+rndr_footnote_def(hoedown_buffer *ob, const hoedown_buffer *content, unsigned int num, const hoedown_renderer_data *data)
+{
+	size_t i = 0;
+	int pfound = 0;
+
+	/* insert anchor at the end of first paragraph block */
+	if (content) {
+		while ((i+3) < content->size) {
+			if (content->data[i++] != '<') continue;
+			if (content->data[i++] != '/') continue;
+			if (content->data[i++] != 'p' && content->data[i] != 'P') continue;
+			if (content->data[i] != '>') continue;
+			i -= 3;
+			pfound = 1;
+			break;
+		}
+	}
+
+	hoedown_buffer_printf(ob, "\n<li id=\"fn%d\">\n", num);
+	if (pfound) {
+		hoedown_buffer_put(ob, content->data, i);
+		hoedown_buffer_printf(ob, "&nbsp;<a href=\"#fnref%d\" rev=\"footnote\">&#8617;</a>", num);
+		hoedown_buffer_put(ob, content->data + i, content->size - i);
+	} else if (content) {
+		hoedown_buffer_put(ob, content->data, content->size);
+	}
+	HOEDOWN_BUFPUTSL(ob, "</li>\n");
+}
+
+static int
+rndr_footnote_ref(hoedown_buffer *ob, unsigned int num, const hoedown_renderer_data *data)
+{
+	hoedown_buffer_printf(ob, "<sup id=\"fnref%d\"><a href=\"#fn%d\" rel=\"footnote\">%d</a></sup>", num, num, num);
+	return 1;
+}
+
+static int
+rndr_math(hoedown_buffer *ob, const hoedown_buffer *text, int displaymode, const hoedown_renderer_data *data)
+{
+	hoedown_buffer_put(ob, (const uint8_t *)(displaymode ? "\\[" : "\\("), 2);
+	escape_html(ob, text->data, text->size);
+	hoedown_buffer_put(ob, (const uint8_t *)(displaymode ? "\\]" : "\\)"), 2);
+	return 1;
+}
+
+static void
+toc_header(hoedown_buffer *ob, const hoedown_buffer *content, int level, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state = data->opaque;
+
+	if (level <= state->toc_data.nesting_level) {
+		/* set the level offset if this is the first header
+		 * we're parsing for the document */
+		if (state->toc_data.current_level == 0)
+			state->toc_data.level_offset = level - 1;
+
+		level -= state->toc_data.level_offset;
+
+		if (level > state->toc_data.current_level) {
+			while (level > state->toc_data.current_level) {
+				HOEDOWN_BUFPUTSL(ob, "<ul>\n<li>\n");
+				state->toc_data.current_level++;
+			}
+		} else if (level < state->toc_data.current_level) {
+			HOEDOWN_BUFPUTSL(ob, "</li>\n");
+			while (level < state->toc_data.current_level) {
+				HOEDOWN_BUFPUTSL(ob, "</ul>\n</li>\n");
+				state->toc_data.current_level--;
+			}
+			HOEDOWN_BUFPUTSL(ob,"<li>\n");
+		} else {
+			HOEDOWN_BUFPUTSL(ob,"</li>\n<li>\n");
+		}
+
+		hoedown_buffer_printf(ob, "<a href=\"#toc_%d\">", state->toc_data.header_count++);
+		if (content) hoedown_buffer_put(ob, content->data, content->size);
+		HOEDOWN_BUFPUTSL(ob, "</a>\n");
+	}
+}
+
+static int
+toc_link(hoedown_buffer *ob, const hoedown_buffer *content, const hoedown_buffer *link, const hoedown_buffer *title, const hoedown_renderer_data *data)
+{
+	if (content && content->size) hoedown_buffer_put(ob, content->data, content->size);
+	return 1;
+}
+
+static void
+toc_finalize(hoedown_buffer *ob, int inline_render, const hoedown_renderer_data *data)
+{
+	hoedown_html_renderer_state *state;
+
+	if (inline_render)
+		return;
+
+	state = data->opaque;
+
+	while (state->toc_data.current_level > 0) {
+		HOEDOWN_BUFPUTSL(ob, "</li>\n</ul>\n");
+		state->toc_data.current_level--;
+	}
+
+	state->toc_data.header_count = 0;
+}
+
+hoedown_renderer *
+hoedown_html_toc_renderer_new(int nesting_level)
+{
+	static const hoedown_renderer cb_default = {
+		NULL,
+
+		NULL,
+		NULL,
+		toc_header,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+
+		NULL,
+		rndr_codespan,
+		rndr_double_emphasis,
+		rndr_emphasis,
+		rndr_underline,
+		rndr_highlight,
+		rndr_quote,
+		NULL,
+		NULL,
+		toc_link,
+		rndr_triple_emphasis,
+		rndr_strikethrough,
+		rndr_superscript,
+		NULL,
+		NULL,
+		NULL,
+
+		NULL,
+		rndr_normal_text,
+
+		NULL,
+		toc_finalize
+	};
+
+	hoedown_html_renderer_state *state;
+	hoedown_renderer *renderer;
+
+	/* Prepare the state pointer */
+	state = hoedown_malloc(sizeof(hoedown_html_renderer_state));
+	memset(state, 0x0, sizeof(hoedown_html_renderer_state));
+
+	state->toc_data.nesting_level = nesting_level;
+
+	/* Prepare the renderer */
+	renderer = hoedown_malloc(sizeof(hoedown_renderer));
+	memcpy(renderer, &cb_default, sizeof(hoedown_renderer));
+
+	renderer->opaque = state;
+	return renderer;
+}
+
+hoedown_renderer *
+hoedown_html_renderer_new(hoedown_html_flags render_flags, int nesting_level)
+{
+	static const hoedown_renderer cb_default = {
+		NULL,
+
+		rndr_blockcode,
+		rndr_blockquote,
+		rndr_header,
+		rndr_hrule,
+		rndr_list,
+		rndr_listitem,
+		rndr_paragraph,
+		rndr_table,
+		rndr_table_header,
+		rndr_table_body,
+		rndr_tablerow,
+		rndr_tablecell,
+		rndr_footnotes,
+		rndr_footnote_def,
+		rndr_raw_block,
+
+		rndr_autolink,
+		rndr_codespan,
+		rndr_double_emphasis,
+		rndr_emphasis,
+		rndr_underline,
+		rndr_highlight,
+		rndr_quote,
+		rndr_image,
+		rndr_linebreak,
+		rndr_link,
+		rndr_triple_emphasis,
+		rndr_strikethrough,
+		rndr_superscript,
+		rndr_footnote_ref,
+		rndr_math,
+		rndr_raw_html,
+
+		NULL,
+		rndr_normal_text,
+
+		NULL,
+		NULL
+	};
+
+	hoedown_html_renderer_state *state;
+	hoedown_renderer *renderer;
+
+	/* Prepare the state pointer */
+	state = hoedown_malloc(sizeof(hoedown_html_renderer_state));
+	memset(state, 0x0, sizeof(hoedown_html_renderer_state));
+
+	state->flags = render_flags;
+	state->toc_data.nesting_level = nesting_level;
+
+	/* Prepare the renderer */
+	renderer = hoedown_malloc(sizeof(hoedown_renderer));
+	memcpy(renderer, &cb_default, sizeof(hoedown_renderer));
+
+	if (render_flags & HOEDOWN_HTML_SKIP_HTML || render_flags & HOEDOWN_HTML_ESCAPE)
+		renderer->blockhtml = NULL;
+
+	renderer->opaque = state;
+	return renderer;
+}
+
+void
+hoedown_html_renderer_free(hoedown_renderer *renderer)
+{
+	free(renderer->opaque);
+	free(renderer);
+}
diff --git a/libraries/hoedown/src/html_blocks.c b/libraries/hoedown/src/html_blocks.c
new file mode 100644
index 00000000..f5e9dce9
--- /dev/null
+++ b/libraries/hoedown/src/html_blocks.c
@@ -0,0 +1,240 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -L ANSI-C -N hoedown_find_block_tag -c -C -E -S 1 --ignore-case -m100 html_block_names.gperf  */
+/* Computed positions: -k'1-2' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+/* maximum key range = 24, duplicates = 0 */
+
+#ifndef GPERF_DOWNCASE
+#define GPERF_DOWNCASE 1
+static unsigned char gperf_downcase[256] =
+  {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+     30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+     45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+     60,  61,  62,  63,  64,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
+    107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+    122,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104,
+    105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+    120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+    165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+    180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+    255
+  };
+#endif
+
+#ifndef GPERF_CASE_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (register const char *s1, register const char *s2, register unsigned int n)
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      22, 21, 19, 18, 16,  0, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25,  1, 25,  0, 25,
+       1,  0,  0, 13,  0, 25, 25, 11,  2,  1,
+       0, 25, 25,  5,  0,  2, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25,  1, 25,
+       0, 25,  1,  0,  0, 13,  0, 25, 25, 11,
+       2,  1,  0, 25, 25,  5,  0,  2, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+      25, 25, 25, 25, 25, 25, 25
+    };
+  register int hval = (int)len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[1]+1];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const char *
+hoedown_find_block_tag (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 24,
+      MIN_WORD_LENGTH = 1,
+      MAX_WORD_LENGTH = 10,
+      MIN_HASH_VALUE = 1,
+      MAX_HASH_VALUE = 24
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          register const char *resword;
+
+          switch (key - 1)
+            {
+              case 0:
+                resword = "p";
+                goto compare;
+              case 1:
+                resword = "h6";
+                goto compare;
+              case 2:
+                resword = "div";
+                goto compare;
+              case 3:
+                resword = "del";
+                goto compare;
+              case 4:
+                resword = "form";
+                goto compare;
+              case 5:
+                resword = "table";
+                goto compare;
+              case 6:
+                resword = "figure";
+                goto compare;
+              case 7:
+                resword = "pre";
+                goto compare;
+              case 8:
+                resword = "fieldset";
+                goto compare;
+              case 9:
+                resword = "noscript";
+                goto compare;
+              case 10:
+                resword = "script";
+                goto compare;
+              case 11:
+                resword = "style";
+                goto compare;
+              case 12:
+                resword = "dl";
+                goto compare;
+              case 13:
+                resword = "ol";
+                goto compare;
+              case 14:
+                resword = "ul";
+                goto compare;
+              case 15:
+                resword = "math";
+                goto compare;
+              case 16:
+                resword = "ins";
+                goto compare;
+              case 17:
+                resword = "h5";
+                goto compare;
+              case 18:
+                resword = "iframe";
+                goto compare;
+              case 19:
+                resword = "h4";
+                goto compare;
+              case 20:
+                resword = "h3";
+                goto compare;
+              case 21:
+                resword = "blockquote";
+                goto compare;
+              case 22:
+                resword = "h2";
+                goto compare;
+              case 23:
+                resword = "h1";
+                goto compare;
+            }
+          return 0;
+        compare:
+          if ((((unsigned char)*str ^ (unsigned char)*resword) & ~32) == 0 && !gperf_case_strncmp (str, resword, len) && resword[len] == '\0')
+            return resword;
+        }
+    }
+  return 0;
+}
diff --git a/libraries/hoedown/src/html_smartypants.c b/libraries/hoedown/src/html_smartypants.c
new file mode 100644
index 00000000..e24b6bf0
--- /dev/null
+++ b/libraries/hoedown/src/html_smartypants.c
@@ -0,0 +1,435 @@
+#include "hoedown/html.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
+struct smartypants_data {
+	int in_squote;
+	int in_dquote;
+};
+
+static size_t smartypants_cb__ltag(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__dquote(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__amp(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__period(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__number(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__dash(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__parens(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__squote(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__backtick(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+static size_t smartypants_cb__escape(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size);
+
+static size_t (*smartypants_cb_ptrs[])
+	(hoedown_buffer *, struct smartypants_data *, uint8_t, const uint8_t *, size_t) =
+{
+	NULL,					/* 0 */
+	smartypants_cb__dash,	/* 1 */
+	smartypants_cb__parens,	/* 2 */
+	smartypants_cb__squote, /* 3 */
+	smartypants_cb__dquote, /* 4 */
+	smartypants_cb__amp,	/* 5 */
+	smartypants_cb__period,	/* 6 */
+	smartypants_cb__number,	/* 7 */
+	smartypants_cb__ltag,	/* 8 */
+	smartypants_cb__backtick, /* 9 */
+	smartypants_cb__escape, /* 10 */
+};
+
+static const uint8_t smartypants_cb_chars[UINT8_MAX+1] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 4, 0, 0, 0, 5, 3, 2, 0, 0, 0, 0, 1, 6, 0,
+	0, 7, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0,
+	9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static int
+word_boundary(uint8_t c)
+{
+	return c == 0 || isspace(c) || ispunct(c);
+}
+
+/*
+	If 'text' begins with any kind of single quote (e.g. "'" or "&apos;" etc.),
+	returns the length of the sequence of characters that makes up the single-
+	quote.  Otherwise, returns zero.
+*/
+static size_t
+squote_len(const uint8_t *text, size_t size)
+{
+	static char* single_quote_list[] = { "'", "&#39;", "&#x27;", "&apos;", NULL };
+	char** p;
+
+	for (p = single_quote_list; *p; ++p) {
+		size_t len = strlen(*p);
+		if (size >= len && memcmp(text, *p, len) == 0) {
+			return len;
+		}
+	}
+
+	return 0;
+}
+
+/* Converts " or ' at very beginning or end of a word to left or right quote */
+static int
+smartypants_quotes(hoedown_buffer *ob, uint8_t previous_char, uint8_t next_char, uint8_t quote, int *is_open)
+{
+	char ent[8];
+
+	if (*is_open && !word_boundary(next_char))
+		return 0;
+
+	if (!(*is_open) && !word_boundary(previous_char))
+		return 0;
+
+	snprintf(ent, sizeof(ent), "&%c%cquo;", (*is_open) ? 'r' : 'l', quote);
+	*is_open = !(*is_open);
+	hoedown_buffer_puts(ob, ent);
+	return 1;
+}
+
+/*
+	Converts ' to left or right single quote; but the initial ' might be in
+	different forms, e.g. &apos; or &#39; or &#x27;.
+	'squote_text' points to the original single quote, and 'squote_size' is its length.
+	'text' points at the last character of the single-quote, e.g. ' or ;
+*/
+static size_t
+smartypants_squote(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size,
+				   const uint8_t *squote_text, size_t squote_size)
+{
+	if (size >= 2) {
+		uint8_t t1 = tolower(text[1]);
+		size_t next_squote_len = squote_len(text+1, size-1);
+
+		/* convert '' to &ldquo; or &rdquo; */
+		if (next_squote_len > 0) {
+			uint8_t next_char = (size > 1+next_squote_len) ? text[1+next_squote_len] : 0;
+			if (smartypants_quotes(ob, previous_char, next_char, 'd', &smrt->in_dquote))
+				return next_squote_len;
+		}
+
+		/* Tom's, isn't, I'm, I'd */
+		if ((t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') &&
+			(size == 3 || word_boundary(text[2]))) {
+			HOEDOWN_BUFPUTSL(ob, "&rsquo;");
+			return 0;
+		}
+
+		/* you're, you'll, you've */
+		if (size >= 3) {
+			uint8_t t2 = tolower(text[2]);
+
+			if (((t1 == 'r' && t2 == 'e') ||
+				(t1 == 'l' && t2 == 'l') ||
+				(t1 == 'v' && t2 == 'e')) &&
+				(size == 4 || word_boundary(text[3]))) {
+				HOEDOWN_BUFPUTSL(ob, "&rsquo;");
+				return 0;
+			}
+		}
+	}
+
+	if (smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 's', &smrt->in_squote))
+		return 0;
+
+	hoedown_buffer_put(ob, squote_text, squote_size);
+	return 0;
+}
+
+/* Converts ' to left or right single quote. */
+static size_t
+smartypants_cb__squote(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	return smartypants_squote(ob, smrt, previous_char, text, size, text, 1);
+}
+
+/* Converts (c), (r), (tm) */
+static size_t
+smartypants_cb__parens(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (size >= 3) {
+		uint8_t t1 = tolower(text[1]);
+		uint8_t t2 = tolower(text[2]);
+
+		if (t1 == 'c' && t2 == ')') {
+			HOEDOWN_BUFPUTSL(ob, "&copy;");
+			return 2;
+		}
+
+		if (t1 == 'r' && t2 == ')') {
+			HOEDOWN_BUFPUTSL(ob, "&reg;");
+			return 2;
+		}
+
+		if (size >= 4 && t1 == 't' && t2 == 'm' && text[3] == ')') {
+			HOEDOWN_BUFPUTSL(ob, "&trade;");
+			return 3;
+		}
+	}
+
+	hoedown_buffer_putc(ob, text[0]);
+	return 0;
+}
+
+/* Converts "--" to em-dash, etc. */
+static size_t
+smartypants_cb__dash(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (size >= 3 && text[1] == '-' && text[2] == '-') {
+		HOEDOWN_BUFPUTSL(ob, "&mdash;");
+		return 2;
+	}
+
+	if (size >= 2 && text[1] == '-') {
+		HOEDOWN_BUFPUTSL(ob, "&ndash;");
+		return 1;
+	}
+
+	hoedown_buffer_putc(ob, text[0]);
+	return 0;
+}
+
+/* Converts &quot; etc. */
+static size_t
+smartypants_cb__amp(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	size_t len;
+	if (size >= 6 && memcmp(text, "&quot;", 6) == 0) {
+		if (smartypants_quotes(ob, previous_char, size >= 7 ? text[6] : 0, 'd', &smrt->in_dquote))
+			return 5;
+	}
+
+	len = squote_len(text, size);
+	if (len > 0) {
+		return (len-1) + smartypants_squote(ob, smrt, previous_char, text+(len-1), size-(len-1), text, len);
+	}
+
+	if (size >= 4 && memcmp(text, "&#0;", 4) == 0)
+		return 3;
+
+	hoedown_buffer_putc(ob, '&');
+	return 0;
+}
+
+/* Converts "..." to ellipsis */
+static size_t
+smartypants_cb__period(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (size >= 3 && text[1] == '.' && text[2] == '.') {
+		HOEDOWN_BUFPUTSL(ob, "&hellip;");
+		return 2;
+	}
+
+	if (size >= 5 && text[1] == ' ' && text[2] == '.' && text[3] == ' ' && text[4] == '.') {
+		HOEDOWN_BUFPUTSL(ob, "&hellip;");
+		return 4;
+	}
+
+	hoedown_buffer_putc(ob, text[0]);
+	return 0;
+}
+
+/* Converts `` to opening double quote */
+static size_t
+smartypants_cb__backtick(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (size >= 2 && text[1] == '`') {
+		if (smartypants_quotes(ob, previous_char, size >= 3 ? text[2] : 0, 'd', &smrt->in_dquote))
+			return 1;
+	}
+
+	hoedown_buffer_putc(ob, text[0]);
+	return 0;
+}
+
+/* Converts 1/2, 1/4, 3/4 */
+static size_t
+smartypants_cb__number(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (word_boundary(previous_char) && size >= 3) {
+		if (text[0] == '1' && text[1] == '/' && text[2] == '2') {
+			if (size == 3 || word_boundary(text[3])) {
+				HOEDOWN_BUFPUTSL(ob, "&frac12;");
+				return 2;
+			}
+		}
+
+		if (text[0] == '1' && text[1] == '/' && text[2] == '4') {
+			if (size == 3 || word_boundary(text[3]) ||
+				(size >= 5 && tolower(text[3]) == 't' && tolower(text[4]) == 'h')) {
+				HOEDOWN_BUFPUTSL(ob, "&frac14;");
+				return 2;
+			}
+		}
+
+		if (text[0] == '3' && text[1] == '/' && text[2] == '4') {
+			if (size == 3 || word_boundary(text[3]) ||
+				(size >= 6 && tolower(text[3]) == 't' && tolower(text[4]) == 'h' && tolower(text[5]) == 's')) {
+				HOEDOWN_BUFPUTSL(ob, "&frac34;");
+				return 2;
+			}
+		}
+	}
+
+	hoedown_buffer_putc(ob, text[0]);
+	return 0;
+}
+
+/* Converts " to left or right double quote */
+static size_t
+smartypants_cb__dquote(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (!smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 'd', &smrt->in_dquote))
+		HOEDOWN_BUFPUTSL(ob, "&quot;");
+
+	return 0;
+}
+
+static size_t
+smartypants_cb__ltag(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	static const char *skip_tags[] = {
+	  "pre", "code", "var", "samp", "kbd", "math", "script", "style"
+	};
+	static const size_t skip_tags_count = 8;
+
+	size_t tag, i = 0;
+
+	/* This is a comment. Copy everything verbatim until --> or EOF is seen. */
+	if (i + 4 < size && memcmp(text, "<!--", 4) == 0) {
+		i += 4;
+		while (i + 3 < size && memcmp(text + i, "-->",  3) != 0)
+			i++;
+		i += 3;
+		hoedown_buffer_put(ob, text, i + 1);
+		return i;
+	}
+
+	while (i < size && text[i] != '>')
+		i++;
+
+	for (tag = 0; tag < skip_tags_count; ++tag) {
+		if (hoedown_html_is_tag(text, size, skip_tags[tag]) == HOEDOWN_HTML_TAG_OPEN)
+			break;
+	}
+
+	if (tag < skip_tags_count) {
+		for (;;) {
+			while (i < size && text[i] != '<')
+				i++;
+
+			if (i == size)
+				break;
+
+			if (hoedown_html_is_tag(text + i, size - i, skip_tags[tag]) == HOEDOWN_HTML_TAG_CLOSE)
+				break;
+
+			i++;
+		}
+
+		while (i < size && text[i] != '>')
+			i++;
+	}
+
+	hoedown_buffer_put(ob, text, i + 1);
+	return i;
+}
+
+static size_t
+smartypants_cb__escape(hoedown_buffer *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	if (size < 2)
+		return 0;
+
+	switch (text[1]) {
+	case '\\':
+	case '"':
+	case '\'':
+	case '.':
+	case '-':
+	case '`':
+		hoedown_buffer_putc(ob, text[1]);
+		return 1;
+
+	default:
+		hoedown_buffer_putc(ob, '\\');
+		return 0;
+	}
+}
+
+#if 0
+static struct {
+    uint8_t c0;
+    const uint8_t *pattern;
+    const uint8_t *entity;
+    int skip;
+} smartypants_subs[] = {
+    { '\'', "'s>",      "&rsquo;",  0 },
+    { '\'', "'t>",      "&rsquo;",  0 },
+    { '\'', "'re>",     "&rsquo;",  0 },
+    { '\'', "'ll>",     "&rsquo;",  0 },
+    { '\'', "'ve>",     "&rsquo;",  0 },
+    { '\'', "'m>",      "&rsquo;",  0 },
+    { '\'', "'d>",      "&rsquo;",  0 },
+    { '-',  "--",       "&mdash;",  1 },
+    { '-',  "<->",      "&ndash;",  0 },
+    { '.',  "...",      "&hellip;", 2 },
+    { '.',  ". . .",    "&hellip;", 4 },
+    { '(',  "(c)",      "&copy;",   2 },
+    { '(',  "(r)",      "&reg;",    2 },
+    { '(',  "(tm)",     "&trade;",  3 },
+    { '3',  "<3/4>",    "&frac34;", 2 },
+    { '3',  "<3/4ths>", "&frac34;", 2 },
+    { '1',  "<1/2>",    "&frac12;", 2 },
+    { '1',  "<1/4>",    "&frac14;", 2 },
+    { '1',  "<1/4th>",  "&frac14;", 2 },
+    { '&',  "&#0;",      0,       3 },
+};
+#endif
+
+void
+hoedown_html_smartypants(hoedown_buffer *ob, const uint8_t *text, size_t size)
+{
+	size_t i;
+	struct smartypants_data smrt = {0, 0};
+
+	if (!text)
+		return;
+
+	hoedown_buffer_grow(ob, size);
+
+	for (i = 0; i < size; ++i) {
+		size_t org;
+		uint8_t action = 0;
+
+		org = i;
+		while (i < size && (action = smartypants_cb_chars[text[i]]) == 0)
+			i++;
+
+		if (i > org)
+			hoedown_buffer_put(ob, text + org, i - org);
+
+		if (i < size) {
+			i += smartypants_cb_ptrs[(int)action]
+				(ob, &smrt, i ? text[i - 1] : 0, text + i, size - i);
+		}
+	}
+}
diff --git a/libraries/hoedown/src/stack.c b/libraries/hoedown/src/stack.c
new file mode 100644
index 00000000..46ead232
--- /dev/null
+++ b/libraries/hoedown/src/stack.c
@@ -0,0 +1,79 @@
+#include "hoedown/stack.h"
+
+#include "hoedown/buffer.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+void
+hoedown_stack_init(hoedown_stack *st, size_t initial_size)
+{
+	assert(st);
+
+	st->item = NULL;
+	st->size = st->asize = 0;
+
+	if (!initial_size)
+		initial_size = 8;
+
+	hoedown_stack_grow(st, initial_size);
+}
+
+void
+hoedown_stack_uninit(hoedown_stack *st)
+{
+	assert(st);
+
+	free(st->item);
+}
+
+void
+hoedown_stack_grow(hoedown_stack *st, size_t neosz)
+{
+	assert(st);
+
+	if (st->asize >= neosz)
+		return;
+
+	st->item = hoedown_realloc(st->item, neosz * sizeof(void *));
+	memset(st->item + st->asize, 0x0, (neosz - st->asize) * sizeof(void *));
+
+	st->asize = neosz;
+
+	if (st->size > neosz)
+		st->size = neosz;
+}
+
+void
+hoedown_stack_push(hoedown_stack *st, void *item)
+{
+	assert(st);
+
+	if (st->size >= st->asize)
+		hoedown_stack_grow(st, st->size * 2);
+
+	st->item[st->size++] = item;
+}
+
+void *
+hoedown_stack_pop(hoedown_stack *st)
+{
+	assert(st);
+
+	if (!st->size)
+		return NULL;
+
+	return st->item[--st->size];
+}
+
+void *
+hoedown_stack_top(const hoedown_stack *st)
+{
+	assert(st);
+
+	if (!st->size)
+		return NULL;
+
+	return st->item[st->size - 1];
+}
diff --git a/libraries/hoedown/src/version.c b/libraries/hoedown/src/version.c
new file mode 100644
index 00000000..625ed196
--- /dev/null
+++ b/libraries/hoedown/src/version.c
@@ -0,0 +1,9 @@
+#include "hoedown/version.h"
+
+void
+hoedown_version(int *major, int *minor, int *revision)
+{
+	*major = HOEDOWN_VERSION_MAJOR;
+	*minor = HOEDOWN_VERSION_MINOR;
+	*revision = HOEDOWN_VERSION_REVISION;
+}
diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt
new file mode 100644
index 00000000..4dfc39a9
--- /dev/null
+++ b/libraries/iconfix/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.1)
+project(iconfix)
+
+find_package(Qt5Core REQUIRED QUIET)
+find_package(Qt5Widgets REQUIRED QUIET)
+
+set(ICONFIX_SOURCES
+xdgicon.h
+xdgicon.cpp
+internal/qhexstring_p.h
+internal/qiconloader.cpp
+internal/qiconloader_p.h
+)
+
+add_library(iconfix STATIC ${ICONFIX_SOURCES})
+target_include_directories(iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+qt5_use_modules(iconfix Core Widgets)
diff --git a/libraries/iconfix/internal/qhexstring_p.h b/libraries/iconfix/internal/qhexstring_p.h
new file mode 100644
index 00000000..f01b4cdd
--- /dev/null
+++ b/libraries/iconfix/internal/qhexstring_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qstring.h>
+#include <QtGui/qpolygon.h>
+#include <QtCore/qstringbuilder.h>
+
+#pragma once
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// internal helper. Converts an integer value to an unique string token
+template <typename T> struct HexString
+{
+	inline HexString(const T t) : val(t)
+	{
+	}
+
+	inline void write(QChar *&dest) const
+	{
+		const ushort hexChars[] = {'0', '1', '2', '3', '4', '5', '6', '7',
+								   '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+		const char *c = reinterpret_cast<const char *>(&val);
+		for (uint i = 0; i < sizeof(T); ++i)
+		{
+			*dest++ = hexChars[*c & 0xf];
+			*dest++ = hexChars[(*c & 0xf0) >> 4];
+			++c;
+		}
+	}
+	const T val;
+};
+
+// specialization to enable fast concatenating of our string tokens to a string
+template <typename T> struct QConcatenable<HexString<T>>
+{
+	typedef HexString<T> type;
+	enum
+	{
+		ExactSize = true
+	};
+	static int size(const HexString<T> &)
+	{
+		return sizeof(T) * 2;
+	}
+	static inline void appendTo(const HexString<T> &str, QChar *&out)
+	{
+		str.write(out);
+	}
+	typedef QString ConvertTo;
+};
diff --git a/libraries/iconfix/internal/qiconloader.cpp b/libraries/iconfix/internal/qiconloader.cpp
new file mode 100644
index 00000000..b1195893
--- /dev/null
+++ b/libraries/iconfix/internal/qiconloader.cpp
@@ -0,0 +1,688 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qiconloader_p.h"
+
+#include <QtGui/QIconEnginePlugin>
+#include <QtGui/QPixmapCache>
+#include <QtGui/QIconEngine>
+#include <QtGui/QPalette>
+#include <QtCore/QList>
+#include <QtCore/QHash>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+#include <QtGui/QPainter>
+#include <QApplication>
+#include <QLatin1Literal>
+
+#include "qhexstring_p.h"
+
+namespace QtXdg
+{
+
+Q_GLOBAL_STATIC(QIconLoader, iconLoaderInstance)
+
+/* Theme to use in last resort, if the theme does not have the icon, neither the parents  */
+
+static QString fallbackTheme()
+{
+	return QString("hicolor");
+}
+
+QIconLoader::QIconLoader() : m_themeKey(1), m_supportsSvg(false), m_initialized(false)
+{
+}
+
+// We lazily initialize the loader to make static icons
+// work. Though we do not officially support this.
+
+static inline QString systemThemeName()
+{
+	return QIcon::themeName();
+}
+
+static inline QStringList systemIconSearchPaths()
+{
+	auto paths = QIcon::themeSearchPaths();
+	paths.push_front(":/icons");
+	return paths;
+}
+
+void QIconLoader::ensureInitialized()
+{
+	if (!m_initialized)
+	{
+		m_initialized = true;
+
+		Q_ASSERT(qApp);
+
+		m_systemTheme = QIcon::themeName();
+
+		if (m_systemTheme.isEmpty())
+			m_systemTheme = fallbackTheme();
+		m_supportsSvg = true;
+	}
+}
+
+QIconLoader *QIconLoader::instance()
+{
+	iconLoaderInstance()->ensureInitialized();
+	return iconLoaderInstance();
+}
+
+// Queries the system theme and invalidates existing
+// icons if the theme has changed.
+void QIconLoader::updateSystemTheme()
+{
+	// Only change if this is not explicitly set by the user
+	if (m_userTheme.isEmpty())
+	{
+		QString theme = systemThemeName();
+		if (theme.isEmpty())
+			theme = fallbackTheme();
+		if (theme != m_systemTheme)
+		{
+			m_systemTheme = theme;
+			invalidateKey();
+		}
+	}
+}
+
+void QIconLoader::setThemeName(const QString &themeName)
+{
+	m_userTheme = themeName;
+	invalidateKey();
+}
+
+void QIconLoader::setThemeSearchPath(const QStringList &searchPaths)
+{
+	m_iconDirs = searchPaths;
+	themeList.clear();
+	invalidateKey();
+}
+
+QStringList QIconLoader::themeSearchPaths() const
+{
+	if (m_iconDirs.isEmpty())
+	{
+		m_iconDirs = systemIconSearchPaths();
+	}
+	return m_iconDirs;
+}
+
+QIconTheme::QIconTheme(const QString &themeName) : m_valid(false)
+{
+	QFile themeIndex;
+
+	QStringList iconDirs = systemIconSearchPaths();
+	for (int i = 0; i < iconDirs.size(); ++i)
+	{
+		QDir iconDir(iconDirs[i]);
+		QString themeDir = iconDir.path() + QLatin1Char('/') + themeName;
+		themeIndex.setFileName(themeDir + QLatin1String("/index.theme"));
+		if (themeIndex.exists())
+		{
+			m_contentDir = themeDir;
+			m_valid = true;
+
+			foreach (QString path, iconDirs)
+			{
+				if (QFileInfo(path).isDir())
+					m_contentDirs.append(path + QLatin1Char('/') + themeName);
+			}
+
+			break;
+		}
+	}
+
+	// if there is no index file, abscond.
+	if (!themeIndex.exists())
+		return;
+
+	// otherwise continue reading index file
+	const QSettings indexReader(themeIndex.fileName(), QSettings::IniFormat);
+	QStringListIterator keyIterator(indexReader.allKeys());
+	while (keyIterator.hasNext())
+	{
+		const QString key = keyIterator.next();
+		if (!key.endsWith(QLatin1String("/Size")))
+			continue;
+
+		// Note the QSettings ini-format does not accept
+		// slashes in key names, hence we have to cheat
+		int size = indexReader.value(key).toInt();
+		if (!size)
+			continue;
+
+		QString directoryKey = key.left(key.size() - 5);
+		QIconDirInfo dirInfo(directoryKey);
+		dirInfo.size = size;
+		QString type =
+			indexReader.value(directoryKey + QLatin1String("/Type")).toString();
+
+		if (type == QLatin1String("Fixed"))
+			dirInfo.type = QIconDirInfo::Fixed;
+		else if (type == QLatin1String("Scalable"))
+			dirInfo.type = QIconDirInfo::Scalable;
+		else
+			dirInfo.type = QIconDirInfo::Threshold;
+
+		dirInfo.threshold =
+			indexReader.value(directoryKey + QLatin1String("/Threshold"), 2)
+				.toInt();
+
+		dirInfo.minSize =
+			indexReader.value(directoryKey + QLatin1String("/MinSize"), size)
+				.toInt();
+
+		dirInfo.maxSize =
+			indexReader.value(directoryKey + QLatin1String("/MaxSize"), size)
+				.toInt();
+		m_keyList.append(dirInfo);
+	}
+
+	// Parent themes provide fallbacks for missing icons
+	m_parents = indexReader.value(QLatin1String("Icon Theme/Inherits")).toStringList();
+	m_parents.removeAll(QString());
+
+	// Ensure a default platform fallback for all themes
+	if (m_parents.isEmpty())
+	{
+		const QString fallback = fallbackTheme();
+		if (!fallback.isEmpty())
+			m_parents.append(fallback);
+	}
+
+	// Ensure that all themes fall back to hicolor
+	if (!m_parents.contains(QLatin1String("hicolor")))
+		m_parents.append(QLatin1String("hicolor"));
+}
+
+QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName, const QString &iconName,
+											  QStringList &visited) const
+{
+	QThemeIconEntries entries;
+	Q_ASSERT(!themeName.isEmpty());
+
+	QPixmap pixmap;
+
+	// Used to protect against potential recursions
+	visited << themeName;
+
+	QIconTheme theme = themeList.value(themeName);
+	if (!theme.isValid())
+	{
+		theme = QIconTheme(themeName);
+		if (!theme.isValid())
+			theme = QIconTheme(fallbackTheme());
+
+		themeList.insert(themeName, theme);
+	}
+
+	QStringList contentDirs = theme.contentDirs();
+	const QVector<QIconDirInfo> subDirs = theme.keyList();
+
+	const QString svgext(QLatin1String(".svg"));
+	const QString pngext(QLatin1String(".png"));
+	const QString xpmext(QLatin1String(".xpm"));
+
+	// Add all relevant files
+	for (int i = 0; i < subDirs.size(); ++i)
+	{
+		const QIconDirInfo &dirInfo = subDirs.at(i);
+		QString subdir = dirInfo.path;
+
+		foreach (QString contentDir, contentDirs)
+		{
+			QDir currentDir(contentDir + '/' + subdir);
+
+			if (currentDir.exists(iconName + pngext))
+			{
+				PixmapEntry *iconEntry = new PixmapEntry;
+				iconEntry->dir = dirInfo;
+				iconEntry->filename = currentDir.filePath(iconName + pngext);
+				// Notice we ensure that pixmap entries always come before
+				// scalable to preserve search order afterwards
+				entries.prepend(iconEntry);
+			}
+			else if (m_supportsSvg && currentDir.exists(iconName + svgext))
+			{
+				ScalableEntry *iconEntry = new ScalableEntry;
+				iconEntry->dir = dirInfo;
+				iconEntry->filename = currentDir.filePath(iconName + svgext);
+				entries.append(iconEntry);
+				break;
+			}
+			else if (currentDir.exists(iconName + xpmext))
+			{
+				PixmapEntry *iconEntry = new PixmapEntry;
+				iconEntry->dir = dirInfo;
+				iconEntry->filename = currentDir.filePath(iconName + xpmext);
+				// Notice we ensure that pixmap entries always come before
+				// scalable to preserve search order afterwards
+				entries.append(iconEntry);
+				break;
+			}
+		}
+	}
+
+	if (entries.isEmpty())
+	{
+		const QStringList parents = theme.parents();
+		// Search recursively through inherited themes
+		for (int i = 0; i < parents.size(); ++i)
+		{
+
+			const QString parentTheme = parents.at(i).trimmed();
+
+			if (!visited.contains(parentTheme)) // guard against recursion
+				entries = findIconHelper(parentTheme, iconName, visited);
+
+			if (!entries.isEmpty()) // success
+				break;
+		}
+	}
+
+/*********************************************************************
+Author: Kaitlin Rupert <kaitlin.rupert@intel.com>
+Date: Aug 12, 2010
+Description: Make it so that the QIcon loader honors /usr/share/pixmaps
+			 directory.  This is a valid directory per the Freedesktop.org
+			 icon theme specification.
+Bug: https://bugreports.qt.nokia.com/browse/QTBUG-12874
+ *********************************************************************/
+#ifdef Q_OS_LINUX
+	/* Freedesktop standard says to look in /usr/share/pixmaps last */
+	if (entries.isEmpty())
+	{
+		const QString pixmaps(QLatin1String("/usr/share/pixmaps"));
+
+		QDir currentDir(pixmaps);
+		QIconDirInfo dirInfo(pixmaps);
+		if (currentDir.exists(iconName + pngext))
+		{
+			PixmapEntry *iconEntry = new PixmapEntry;
+			iconEntry->dir = dirInfo;
+			iconEntry->filename = currentDir.filePath(iconName + pngext);
+			// Notice we ensure that pixmap entries always come before
+			// scalable to preserve search order afterwards
+			entries.prepend(iconEntry);
+		}
+		else if (m_supportsSvg && currentDir.exists(iconName + svgext))
+		{
+			ScalableEntry *iconEntry = new ScalableEntry;
+			iconEntry->dir = dirInfo;
+			iconEntry->filename = currentDir.filePath(iconName + svgext);
+			entries.append(iconEntry);
+		}
+		else if (currentDir.exists(iconName + xpmext))
+		{
+			PixmapEntry *iconEntry = new PixmapEntry;
+			iconEntry->dir = dirInfo;
+			iconEntry->filename = currentDir.filePath(iconName + xpmext);
+			// Notice we ensure that pixmap entries always come before
+			// scalable to preserve search order afterwards
+			entries.append(iconEntry);
+		}
+	}
+#endif
+
+	if (entries.isEmpty())
+	{
+		// Search for unthemed icons in main dir of search paths
+		QStringList themeSearchPaths = QIcon::themeSearchPaths();
+		foreach (QString contentDir, themeSearchPaths)
+		{
+			QDir currentDir(contentDir);
+
+			if (currentDir.exists(iconName + pngext))
+			{
+				PixmapEntry *iconEntry = new PixmapEntry;
+				iconEntry->filename = currentDir.filePath(iconName + pngext);
+				// Notice we ensure that pixmap entries always come before
+				// scalable to preserve search order afterwards
+				entries.prepend(iconEntry);
+			}
+			else if (m_supportsSvg && currentDir.exists(iconName + svgext))
+			{
+				ScalableEntry *iconEntry = new ScalableEntry;
+				iconEntry->filename = currentDir.filePath(iconName + svgext);
+				entries.append(iconEntry);
+				break;
+			}
+			else if (currentDir.exists(iconName + xpmext))
+			{
+				PixmapEntry *iconEntry = new PixmapEntry;
+				iconEntry->filename = currentDir.filePath(iconName + xpmext);
+				// Notice we ensure that pixmap entries always come before
+				// scalable to preserve search order afterwards
+				entries.append(iconEntry);
+				break;
+			}
+		}
+	}
+	return entries;
+}
+
+QThemeIconEntries QIconLoader::loadIcon(const QString &name) const
+{
+	if (!themeName().isEmpty())
+	{
+		QStringList visited;
+		return findIconHelper(themeName(), name, visited);
+	}
+
+	return QThemeIconEntries();
+}
+
+// -------- Icon Loader Engine -------- //
+
+QIconLoaderEngineFixed::QIconLoaderEngineFixed(const QString &iconName)
+	: m_iconName(iconName), m_key(0)
+{
+}
+
+QIconLoaderEngineFixed::~QIconLoaderEngineFixed()
+{
+	qDeleteAll(m_entries);
+}
+
+QIconLoaderEngineFixed::QIconLoaderEngineFixed(const QIconLoaderEngineFixed &other)
+	: QIconEngine(other), m_iconName(other.m_iconName), m_key(0)
+{
+}
+
+QIconEngine *QIconLoaderEngineFixed::clone() const
+{
+	return new QIconLoaderEngineFixed(*this);
+}
+
+bool QIconLoaderEngineFixed::read(QDataStream &in)
+{
+	in >> m_iconName;
+	return true;
+}
+
+bool QIconLoaderEngineFixed::write(QDataStream &out) const
+{
+	out << m_iconName;
+	return true;
+}
+
+bool QIconLoaderEngineFixed::hasIcon() const
+{
+	return !(m_entries.isEmpty());
+}
+
+// Lazily load the icon
+void QIconLoaderEngineFixed::ensureLoaded()
+{
+	if (!(QIconLoader::instance()->themeKey() == m_key))
+	{
+
+		qDeleteAll(m_entries);
+
+		m_entries = QIconLoader::instance()->loadIcon(m_iconName);
+		m_key = QIconLoader::instance()->themeKey();
+	}
+}
+
+void QIconLoaderEngineFixed::paint(QPainter *painter, const QRect &rect, QIcon::Mode mode,
+								   QIcon::State state)
+{
+	QSize pixmapSize = rect.size();
+#if defined(Q_WS_MAC)
+	pixmapSize *= qt_mac_get_scalefactor();
+#endif
+	painter->drawPixmap(rect, pixmap(pixmapSize, mode, state));
+}
+
+/*
+ * This algorithm is defined by the freedesktop spec:
+ * http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+ */
+static bool directoryMatchesSize(const QIconDirInfo &dir, int iconsize)
+{
+	if (dir.type == QIconDirInfo::Fixed)
+	{
+		return dir.size == iconsize;
+	}
+	else if (dir.type == QIconDirInfo::Scalable)
+	{
+		return dir.size <= dir.maxSize && iconsize >= dir.minSize;
+	}
+	else if (dir.type == QIconDirInfo::Threshold)
+	{
+		return iconsize >= dir.size - dir.threshold && iconsize <= dir.size + dir.threshold;
+	}
+
+	Q_ASSERT(1); // Not a valid value
+	return false;
+}
+
+/*
+ * This algorithm is defined by the freedesktop spec:
+ * http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+ */
+static int directorySizeDistance(const QIconDirInfo &dir, int iconsize)
+{
+	if (dir.type == QIconDirInfo::Fixed)
+	{
+		return qAbs(dir.size - iconsize);
+	}
+	else if (dir.type == QIconDirInfo::Scalable)
+	{
+		if (iconsize < dir.minSize)
+			return dir.minSize - iconsize;
+		else if (iconsize > dir.maxSize)
+			return iconsize - dir.maxSize;
+		else
+			return 0;
+	}
+	else if (dir.type == QIconDirInfo::Threshold)
+	{
+		if (iconsize < dir.size - dir.threshold)
+			return dir.minSize - iconsize;
+		else if (iconsize > dir.size + dir.threshold)
+			return iconsize - dir.maxSize;
+		else
+			return 0;
+	}
+
+	Q_ASSERT(1); // Not a valid value
+	return INT_MAX;
+}
+
+QIconLoaderEngineEntry *QIconLoaderEngineFixed::entryForSize(const QSize &size)
+{
+	int iconsize = qMin(size.width(), size.height());
+
+	// Note that m_entries are sorted so that png-files
+	// come first
+
+	const int numEntries = m_entries.size();
+
+	// Search for exact matches first
+	for (int i = 0; i < numEntries; ++i)
+	{
+		QIconLoaderEngineEntry *entry = m_entries.at(i);
+		if (directoryMatchesSize(entry->dir, iconsize))
+		{
+			return entry;
+		}
+	}
+
+	// Find the minimum distance icon
+	int minimalSize = INT_MAX;
+	QIconLoaderEngineEntry *closestMatch = 0;
+	for (int i = 0; i < numEntries; ++i)
+	{
+		QIconLoaderEngineEntry *entry = m_entries.at(i);
+		int distance = directorySizeDistance(entry->dir, iconsize);
+		if (distance < minimalSize)
+		{
+			minimalSize = distance;
+			closestMatch = entry;
+		}
+	}
+	return closestMatch;
+}
+
+/*
+ * Returns the actual icon size. For scalable svg's this is equivalent
+ * to the requested size. Otherwise the closest match is returned but
+ * we can never return a bigger size than the requested size.
+ *
+ */
+QSize QIconLoaderEngineFixed::actualSize(const QSize &size, QIcon::Mode mode,
+										 QIcon::State state)
+{
+	ensureLoaded();
+
+	QIconLoaderEngineEntry *entry = entryForSize(size);
+	if (entry)
+	{
+		const QIconDirInfo &dir = entry->dir;
+		if (dir.type == QIconDirInfo::Scalable)
+			return size;
+		else
+		{
+			int result = qMin<int>(dir.size, qMin(size.width(), size.height()));
+			return QSize(result, result);
+		}
+	}
+	return QIconEngine::actualSize(size, mode, state);
+}
+
+QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
+{
+	Q_UNUSED(state);
+
+	// Ensure that basePixmap is lazily initialized before generating the
+	// key, otherwise the cache key is not unique
+	if (basePixmap.isNull())
+		basePixmap.load(filename);
+
+	QSize actualSize = basePixmap.size();
+	if (!actualSize.isNull() &&
+		(actualSize.width() > size.width() || actualSize.height() > size.height()))
+		actualSize.scale(size, Qt::KeepAspectRatio);
+
+	QString key = QLatin1String("$qt_theme_") % HexString<qint64>(basePixmap.cacheKey()) %
+				  HexString<int>(mode) %
+				  HexString<qint64>(QGuiApplication::palette().cacheKey()) %
+				  HexString<int>(actualSize.width()) % HexString<int>(actualSize.height());
+
+	QPixmap cachedPixmap;
+	if (QPixmapCache::find(key, &cachedPixmap))
+	{
+		return cachedPixmap;
+	}
+	else
+	{
+		if (basePixmap.size() != actualSize)
+		{
+			cachedPixmap = basePixmap.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+		}
+		else
+		{
+			cachedPixmap = basePixmap;
+		}
+		QPixmapCache::insert(key, cachedPixmap);
+	}
+	return cachedPixmap;
+}
+
+QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
+{
+	if (svgIcon.isNull())
+	{
+		svgIcon = QIcon(filename);
+	}
+
+	// Simply reuse svg icon engine
+	return svgIcon.pixmap(size, mode, state);
+}
+
+QPixmap QIconLoaderEngineFixed::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
+{
+	ensureLoaded();
+
+	QIconLoaderEngineEntry *entry = entryForSize(size);
+	if (entry)
+	{
+		return entry->pixmap(size, mode, state);
+	}
+
+	return QPixmap();
+}
+
+QString QIconLoaderEngineFixed::key() const
+{
+	return QLatin1String("QIconLoaderEngineFixed");
+}
+
+void QIconLoaderEngineFixed::virtual_hook(int id, void *data)
+{
+	ensureLoaded();
+
+	switch (id)
+	{
+	case QIconEngine::AvailableSizesHook:
+	{
+		QIconEngine::AvailableSizesArgument &arg =
+			*reinterpret_cast<QIconEngine::AvailableSizesArgument *>(data);
+		const int N = m_entries.size();
+		QList<QSize> sizes;
+		sizes.reserve(N);
+
+		// Gets all sizes from the DirectoryInfo entries
+		for (int i = 0; i < N; ++i)
+		{
+			int size = m_entries.at(i)->dir.size;
+			sizes.append(QSize(size, size));
+		}
+		arg.sizes.swap(sizes); // commit
+	}
+	break;
+	case QIconEngine::IconNameHook:
+	{
+		QString &name = *reinterpret_cast<QString *>(data);
+		name = m_iconName;
+	}
+	break;
+	default:
+		QIconEngine::virtual_hook(id, data);
+	}
+}
+
+} // QtXdg
diff --git a/libraries/iconfix/internal/qiconloader_p.h b/libraries/iconfix/internal/qiconloader_p.h
new file mode 100644
index 00000000..b71bdd83
--- /dev/null
+++ b/libraries/iconfix/internal/qiconloader_p.h
@@ -0,0 +1,219 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtCore/qglobal.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/QIcon>
+#include <QtGui/QIconEngine>
+#include <QtGui/QPixmapCache>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
+#include <QtCore/QTypeInfo>
+
+
+namespace QtXdg
+{
+
+class QIconLoader;
+
+struct QIconDirInfo
+{
+	enum Type
+	{
+		Fixed,
+		Scalable,
+		Threshold
+	};
+	QIconDirInfo(const QString &_path = QString())
+		: path(_path), size(0), maxSize(0), minSize(0), threshold(0), type(Threshold)
+	{
+	}
+	QString path;
+	short size;
+	short maxSize;
+	short minSize;
+	short threshold;
+	Type type : 4;
+};
+
+class QIconLoaderEngineEntry
+{
+public:
+	virtual ~QIconLoaderEngineEntry()
+	{
+	}
+	virtual QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) = 0;
+	QString filename;
+	QIconDirInfo dir;
+	static int count;
+};
+
+struct ScalableEntry : public QIconLoaderEngineEntry
+{
+	QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+	QIcon svgIcon;
+};
+
+struct PixmapEntry : public QIconLoaderEngineEntry
+{
+	QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+	QPixmap basePixmap;
+};
+
+typedef QList<QIconLoaderEngineEntry *> QThemeIconEntries;
+
+// class QIconLoaderEngine : public QIconEngine
+class QIconLoaderEngineFixed : public QIconEngine
+{
+public:
+	QIconLoaderEngineFixed(const QString &iconName = QString());
+	~QIconLoaderEngineFixed();
+
+	void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state);
+	QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state);
+	QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state);
+	QIconEngine *clone() const;
+	bool read(QDataStream &in);
+	bool write(QDataStream &out) const;
+
+private:
+	QString key() const;
+	bool hasIcon() const;
+	void ensureLoaded();
+	void virtual_hook(int id, void *data);
+	QIconLoaderEngineEntry *entryForSize(const QSize &size);
+	QIconLoaderEngineFixed(const QIconLoaderEngineFixed &other);
+	QThemeIconEntries m_entries;
+	QString m_iconName;
+	uint m_key;
+
+	friend class QIconLoader;
+};
+
+class QIconTheme
+{
+public:
+	QIconTheme(const QString &name);
+	QIconTheme() : m_valid(false)
+	{
+	}
+	QStringList parents()
+	{
+		return m_parents;
+	}
+	QVector<QIconDirInfo> keyList()
+	{
+		return m_keyList;
+	}
+	QString contentDir()
+	{
+		return m_contentDir;
+	}
+	QStringList contentDirs()
+	{
+		return m_contentDirs;
+	}
+	bool isValid()
+	{
+		return m_valid;
+	}
+
+private:
+	QString m_contentDir;
+	QStringList m_contentDirs;
+	QVector<QIconDirInfo> m_keyList;
+	QStringList m_parents;
+	bool m_valid;
+};
+
+class QIconLoader
+{
+public:
+	QIconLoader();
+	QThemeIconEntries loadIcon(const QString &iconName) const;
+	uint themeKey() const
+	{
+		return m_themeKey;
+	}
+
+	QString themeName() const
+	{
+		return m_userTheme.isEmpty() ? m_systemTheme : m_userTheme;
+	}
+	void setThemeName(const QString &themeName);
+	QIconTheme theme()
+	{
+		return themeList.value(themeName());
+	}
+	void setThemeSearchPath(const QStringList &searchPaths);
+	QStringList themeSearchPaths() const;
+	QIconDirInfo dirInfo(int dirindex);
+	static QIconLoader *instance();
+	void updateSystemTheme();
+	void invalidateKey()
+	{
+		m_themeKey++;
+	}
+	void ensureInitialized();
+
+private:
+	QThemeIconEntries findIconHelper(const QString &themeName, const QString &iconName,
+									 QStringList &visited) const;
+	uint m_themeKey;
+	bool m_supportsSvg;
+	bool m_initialized;
+
+	mutable QString m_userTheme;
+	mutable QString m_systemTheme;
+	mutable QStringList m_iconDirs;
+	mutable QHash<QString, QIconTheme> themeList;
+};
+
+} // QtXdg
+
+// Note: class template specialization of 'QTypeInfo' must occur at
+//       global scope
+Q_DECLARE_TYPEINFO(QtXdg::QIconDirInfo, Q_MOVABLE_TYPE);
diff --git a/libraries/iconfix/xdgicon.cpp b/libraries/iconfix/xdgicon.cpp
new file mode 100644
index 00000000..a36d80a9
--- /dev/null
+++ b/libraries/iconfix/xdgicon.cpp
@@ -0,0 +1,152 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Razor - a lightweight, Qt based, desktop toolset
+ * http://razor-qt.org
+ *
+ * Copyright: 2010-2011 Razor team
+ * Authors:
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This program or library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#include "xdgicon.h"
+
+#include <QString>
+#include <QDebug>
+#include <QDir>
+#include <QStringList>
+#include <QFileInfo>
+#include <QCache>
+#include "internal/qiconloader_p.h"
+#include <QCoreApplication>
+
+/************************************************
+
+ ************************************************/
+static void qt_cleanup_icon_cache();
+typedef QCache<QString, QIcon> IconCache;
+
+namespace
+{
+struct QtIconCache : public IconCache
+{
+	QtIconCache()
+	{
+		qAddPostRoutine(qt_cleanup_icon_cache);
+	}
+};
+}
+Q_GLOBAL_STATIC(IconCache, qtIconCache);
+
+static void qt_cleanup_icon_cache()
+{
+	qtIconCache()->clear();
+}
+
+/************************************************
+
+ ************************************************/
+XdgIcon::XdgIcon()
+{
+}
+
+/************************************************
+
+ ************************************************/
+XdgIcon::~XdgIcon()
+{
+}
+
+/************************************************
+ Returns the name of the current icon theme.
+ ************************************************/
+QString XdgIcon::themeName()
+{
+	return QIcon::themeName();
+}
+
+/************************************************
+ Sets the current icon theme to name.
+ ************************************************/
+void XdgIcon::setThemeName(const QString &themeName)
+{
+	QIcon::setThemeName(themeName);
+	QtXdg::QIconLoader::instance()->updateSystemTheme();
+}
+
+/************************************************
+ Returns the QIcon corresponding to name in the current icon theme. If no such icon
+ is found in the current theme fallback is return instead.
+ ************************************************/
+QIcon XdgIcon::fromTheme(const QString &iconName, const QIcon &fallback)
+{
+	if (iconName.isEmpty())
+		return fallback;
+
+	bool isAbsolute = (iconName[0] == '/');
+
+	QString name = QFileInfo(iconName).fileName();
+	if (name.endsWith(".png", Qt::CaseInsensitive) ||
+		name.endsWith(".svg", Qt::CaseInsensitive) ||
+		name.endsWith(".xpm", Qt::CaseInsensitive))
+	{
+		name.truncate(name.length() - 4);
+	}
+
+	QIcon icon;
+
+	if (qtIconCache()->contains(name))
+	{
+		icon = *qtIconCache()->object(name);
+	}
+	else
+	{
+		QIcon *cachedIcon;
+		if (!isAbsolute)
+			cachedIcon = new QIcon(new QtXdg::QIconLoaderEngineFixed(name));
+		else
+			cachedIcon = new QIcon(iconName);
+		qtIconCache()->insert(name, cachedIcon);
+		icon = *cachedIcon;
+	}
+
+	// Note the qapp check is to allow lazy loading of static icons
+	// Supporting fallbacks will not work for this case.
+	if (qApp && !isAbsolute && icon.availableSizes().isEmpty())
+	{
+		return fallback;
+	}
+	return icon;
+}
+
+/************************************************
+ Returns the QIcon corresponding to names in the current icon theme. If no such icon
+ is found in the current theme fallback is return instead.
+ ************************************************/
+QIcon XdgIcon::fromTheme(const QStringList &iconNames, const QIcon &fallback)
+{
+	foreach (QString iconName, iconNames)
+	{
+		QIcon icon = fromTheme(iconName);
+		if (!icon.isNull())
+			return icon;
+	}
+
+	return fallback;
+}
diff --git a/libraries/iconfix/xdgicon.h b/libraries/iconfix/xdgicon.h
new file mode 100644
index 00000000..9c11683a
--- /dev/null
+++ b/libraries/iconfix/xdgicon.h
@@ -0,0 +1,46 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Razor - a lightweight, Qt based, desktop toolset
+ * http://razor-qt.org
+ *
+ * Copyright: 2010-2011 Razor team
+ * Authors:
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This program or library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#pragma once
+
+#include <QtGui/QIcon>
+#include <QString>
+#include <QStringList>
+
+class XdgIcon
+{
+public:
+	static QIcon fromTheme(const QString &iconName, const QIcon &fallback = QIcon());
+	static QIcon fromTheme(const QStringList &iconNames, const QIcon &fallback = QIcon());
+
+	static QString themeName();
+	static void setThemeName(const QString &themeName);
+
+protected:
+	explicit XdgIcon();
+	virtual ~XdgIcon();
+};
diff --git a/libraries/javacheck/.gitignore b/libraries/javacheck/.gitignore
new file mode 100644
index 00000000..cc1c52bf
--- /dev/null
+++ b/libraries/javacheck/.gitignore
@@ -0,0 +1,6 @@
+.idea
+*.iml
+out
+.classpath
+.idea
+.project
diff --git a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
new file mode 100644
index 00000000..9768650e
--- /dev/null
+++ b/libraries/javacheck/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+project(launcher Java)
+find_package(Java 1.6 REQUIRED COMPONENTS Development)
+
+include(UseJava)
+set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck)
+set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
+
+set(SRC
+	JavaCheck.java
+)
+
+add_jar(JavaCheck ${SRC})
diff --git a/libraries/javacheck/JavaCheck.java b/libraries/javacheck/JavaCheck.java
new file mode 100644
index 00000000..11420b86
--- /dev/null
+++ b/libraries/javacheck/JavaCheck.java
@@ -0,0 +1,24 @@
+import java.lang.Integer;
+
+public class JavaCheck
+{
+	private static final String[] keys = {"os.arch", "java.version"};
+	public static void main (String [] args)
+	{
+		int ret = 0;
+		for(String key : keys)
+		{
+			String property = System.getProperty(key);
+			if(property != null)
+			{
+				System.out.println(key + "=" + property);
+			}
+			else
+			{
+				ret = 1;
+			}
+		}
+		
+		System.exit(ret);
+	}
+}
diff --git a/libraries/launcher/.gitignore b/libraries/launcher/.gitignore
new file mode 100644
index 00000000..cc1c52bf
--- /dev/null
+++ b/libraries/launcher/.gitignore
@@ -0,0 +1,6 @@
+.idea
+*.iml
+out
+.classpath
+.idea
+.project
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
new file mode 100644
index 00000000..b62805e0
--- /dev/null
+++ b/libraries/launcher/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.1)
+project(launcher Java)
+find_package(Java 1.6 REQUIRED COMPONENTS Development)
+
+include(UseJava)
+set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
+set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
+
+set(SRC
+	# OSX things
+	org/simplericity/macify/eawt/Application.java
+	org/simplericity/macify/eawt/ApplicationAdapter.java
+	org/simplericity/macify/eawt/ApplicationEvent.java
+	org/simplericity/macify/eawt/ApplicationListener.java
+	org/simplericity/macify/eawt/DefaultApplication.java
+
+	# legacy applet wrapper thing.
+	# The launcher has to be there for silly FML/Forge relauncher.
+	net/minecraft/Launcher.java
+	org/multimc/legacy/LegacyLauncher.java
+	org/multimc/LegacyFrame.java
+
+	# onesix launcher
+	org/multimc/onesix/OneSixLauncher.java
+
+	# generic launcher
+	org/multimc/EntryPoint.java
+	org/multimc/Launcher.java
+	org/multimc/ParseException.java
+	org/multimc/Utils.java
+	org/multimc/IconLoader.java
+)
+add_jar(NewLaunch ${SRC})
+
diff --git a/libraries/launcher/net/minecraft/Launcher.java b/libraries/launcher/net/minecraft/Launcher.java
new file mode 100644
index 00000000..a53501ec
--- /dev/null
+++ b/libraries/launcher/net/minecraft/Launcher.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.minecraft;
+
+import java.util.TreeMap;
+import java.util.Map;
+import java.net.URL;
+import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.Graphics;
+import java.applet.Applet;
+import java.applet.AppletStub;
+import java.net.MalformedURLException;
+
+public class Launcher extends Applet implements AppletStub
+{
+	private Applet wrappedApplet;
+	private URL documentBase;
+	private boolean active = false;
+	private final Map<String, String> params;
+
+	public Launcher(Applet applet, URL documentBase)
+	{
+		params = new TreeMap<String, String>();
+
+		this.setLayout(new BorderLayout());
+	    this.add(applet, "Center");
+		this.wrappedApplet = applet;
+		this.documentBase = documentBase;
+	}
+
+	public void setParameter(String name, String value)
+	{
+		params.put(name, value);
+	}
+
+	public void replace(Applet applet)
+	{
+		this.wrappedApplet = applet;
+
+		applet.setStub(this);
+		applet.setSize(getWidth(), getHeight());
+
+		this.setLayout(new BorderLayout());
+		this.add(applet, "Center");
+
+	    applet.init();
+	    active = true;
+	    applet.start();
+	    validate();
+	}
+
+	@Override
+	public String getParameter(String name)
+	{
+		String param = params.get(name);
+		if (param != null)
+			return param;
+		try
+		{
+			return super.getParameter(name);
+		} catch (Exception ignore){}
+		return null;
+	}
+
+	@Override
+	public boolean isActive()
+	{
+		return active;
+	}
+
+	@Override
+	public void appletResize(int width, int height)
+	{
+		wrappedApplet.resize(width, height);
+	}
+
+	@Override
+	public void resize(int width, int height)
+	{
+		wrappedApplet.resize(width, height);
+	}
+
+	@Override
+	public void resize(Dimension d)
+	{
+		wrappedApplet.resize(d);
+	}
+
+	@Override
+	public void init()
+	{
+		if (wrappedApplet != null)
+		{
+			wrappedApplet.init();
+		}
+	}
+
+	@Override
+	public void start()
+	{
+		wrappedApplet.start();
+		active = true;
+	}
+
+	@Override
+	public void stop()
+	{
+		wrappedApplet.stop();
+		active = false;
+	}
+
+	public void destroy()
+	{
+		wrappedApplet.destroy();
+	}
+
+	@Override
+	public URL getCodeBase() {
+		try {
+			return new URL("http://www.minecraft.net/game/");
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public URL getDocumentBase()
+	{
+		try {
+			return new URL("http://www.minecraft.net/game/");
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public void setVisible(boolean b)
+	{
+		super.setVisible(b);
+		wrappedApplet.setVisible(b);
+	}
+	public void update(Graphics paramGraphics)
+	{
+	}
+	public void paint(Graphics paramGraphics)
+	{
+	}
+}
\ No newline at end of file
diff --git a/libraries/launcher/org/multimc/EntryPoint.java b/libraries/launcher/org/multimc/EntryPoint.java
new file mode 100644
index 00000000..d1fc54a8
--- /dev/null
+++ b/libraries/launcher/org/multimc/EntryPoint.java
@@ -0,0 +1,178 @@
+package org.multimc;/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.multimc.legacy.LegacyLauncher;
+import org.multimc.onesix.OneSixLauncher;
+import org.simplericity.macify.eawt.Application;
+import org.simplericity.macify.eawt.DefaultApplication;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.nio.charset.Charset;
+
+public class EntryPoint
+{
+	private enum Action
+	{
+		Proceed,
+		Launch,
+		Abort
+	}
+
+	public static void main(String[] args)
+	{
+		// Set the OSX application icon first, if we are on OSX.
+		Application application = new DefaultApplication();
+		if(application.isMac())
+		{
+			try
+			{
+				BufferedImage image = ImageIO.read(new File("icon.png"));
+				application.setApplicationIconImage(image);
+			}
+			catch (IOException e)
+			{
+				e.printStackTrace();
+			}
+		}
+
+		EntryPoint listener = new EntryPoint();
+		int retCode = listener.listen();
+		if (retCode != 0)
+		{
+			System.out.println("Exiting with " + retCode);
+			System.exit(retCode);
+		}
+	}
+
+	private Action parseLine(String inData) throws ParseException
+	{
+		String[] pair = inData.split(" ", 2);
+
+		if(pair.length == 1)
+		{
+			String command = pair[0];
+			if (pair[0].equals("launch"))
+				return Action.Launch;
+
+			else if (pair[0].equals("abort"))
+				return Action.Abort;
+
+			else throw new ParseException();
+		}
+
+		if(pair.length != 2)
+			throw new ParseException();
+
+		String command = pair[0];
+		String param = pair[1];
+
+		if(command.equals("launcher"))
+		{
+			if(param.equals("legacy"))
+			{
+				m_launcher = new LegacyLauncher();
+				Utils.log("Using legacy launcher.");
+				Utils.log();
+				return Action.Proceed;
+			}
+			if(param.equals("onesix"))
+			{
+				m_launcher = new OneSixLauncher();
+				Utils.log("Using onesix launcher.");
+				Utils.log();
+				return Action.Proceed;
+			}
+			else
+				throw new ParseException();
+		}
+
+		m_params.add(command, param);
+		//System.out.println(command + " : " + param);
+		return Action.Proceed;
+	}
+
+	public int listen()
+	{
+		BufferedReader buffer;
+		try
+		{
+			buffer = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
+		} catch (UnsupportedEncodingException e)
+		{
+			System.err.println("For some reason, your java does not support UTF-8. Consider living in the current century.");
+			e.printStackTrace();
+			return 1;
+		}
+		boolean isListening = true;
+		boolean isAborted = false;
+		// Main loop
+		while (isListening)
+		{
+			String inData;
+			try
+			{
+				// Read from the pipe one line at a time
+				inData = buffer.readLine();
+				if (inData != null)
+				{
+					Action a = parseLine(inData);
+					if(a == Action.Abort)
+					{
+						isListening = false;
+						isAborted = true;
+					}
+					if(a == Action.Launch)
+					{
+						isListening = false;
+					}
+				}
+				else
+				{
+					isListening = false;
+					isAborted = true;
+				}
+			}
+			catch (IOException e)
+			{
+				System.err.println("Launcher ABORT due to IO exception:");
+				e.printStackTrace();
+				return 1;
+			}
+			catch (ParseException e)
+			{
+				System.err.println("Launcher ABORT due to PARSE exception:");
+				e.printStackTrace();
+				return 1;
+			}
+		}
+		if(isAborted)
+		{
+			System.err.println("Launch aborted by MultiMC.");
+			return 1;
+		}
+		if(m_launcher != null)
+		{
+			return m_launcher.launch(m_params);
+		}
+		System.err.println("No valid launcher implementation specified.");
+		return 1;
+	}
+
+	private ParamBucket m_params = new ParamBucket();
+	private org.multimc.Launcher m_launcher;
+}
diff --git a/libraries/launcher/org/multimc/IconLoader.java b/libraries/launcher/org/multimc/IconLoader.java
new file mode 100644
index 00000000..f1638f3a
--- /dev/null
+++ b/libraries/launcher/org/multimc/IconLoader.java
@@ -0,0 +1,132 @@
+package org.multimc;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/*****************************************************************************
+ * A convenience class for loading icons from images.
+ *
+ * Icons loaded from this class are formatted to fit within the required
+ * dimension (16x16, 32x32, or 128x128). If the source image is larger than the
+ * target dimension, it is shrunk down to the minimum size that will fit. If it
+ * is smaller, then it is only scaled up if the new scale can be a per-pixel
+ * linear scale (i.e., x2, x3, x4, etc). In both cases, the image's width/height
+ * ratio is kept the same as the source image.
+ *
+ * @author Chris Molini
+ *****************************************************************************/
+public class IconLoader
+{
+	/*************************************************************************
+	 * Loads an icon in ByteBuffer form.
+	 *
+	 * @param filepath
+	 *            The location of the Image to use as an icon.
+	 *
+	 * @return An array of ByteBuffers containing the pixel data for the icon in
+	 *         various sizes (as recommended by the OS).
+	 *************************************************************************/
+	public static ByteBuffer[] load(String filepath)
+	{
+		BufferedImage image;
+		try {
+			image = ImageIO.read ( new File( filepath ) );
+		} catch ( IOException e ) {
+			e.printStackTrace();
+			return new ByteBuffer[0];
+		}
+		ByteBuffer[] buffers;
+		buffers = new ByteBuffer[1];
+		buffers[0] = loadInstance(image, 128);
+		return buffers;
+	}
+
+	/*************************************************************************
+	 * Copies the supplied image into a square icon at the indicated size.
+	 *
+	 * @param image
+	 *            The image to place onto the icon.
+	 * @param dimension
+	 *            The desired size of the icon.
+	 *
+	 * @return A ByteBuffer of pixel data at the indicated size.
+	 *************************************************************************/
+	private static ByteBuffer loadInstance(BufferedImage image, int dimension)
+	{
+		BufferedImage scaledIcon = new BufferedImage(dimension, dimension,
+				BufferedImage.TYPE_INT_ARGB_PRE);
+		Graphics2D g = scaledIcon.createGraphics();
+		double ratio = getIconRatio(image, scaledIcon);
+		double width = image.getWidth() * ratio;
+		double height = image.getHeight() * ratio;
+		g.drawImage(image, (int) ((scaledIcon.getWidth() - width) / 2),
+				(int) ((scaledIcon.getHeight() - height) / 2), (int) (width),
+				(int) (height), null);
+		g.dispose();
+
+		return convertToByteBuffer(scaledIcon);
+	}
+
+	/*************************************************************************
+	 * Gets the width/height ratio of the icon. This is meant to simplify
+	 * scaling the icon to a new dimension.
+	 *
+	 * @param src
+	 *            The base image that will be placed onto the icon.
+	 * @param icon
+	 *            The icon that will have the image placed on it.
+	 *
+	 * @return The amount to scale the source image to fit it onto the icon
+	 *         appropriately.
+	 *************************************************************************/
+	private static double getIconRatio(BufferedImage src, BufferedImage icon)
+	{
+		double ratio = 1;
+		if (src.getWidth() > icon.getWidth())
+			ratio = (double) (icon.getWidth()) / src.getWidth();
+		else
+			ratio = (int) (icon.getWidth() / src.getWidth());
+		if (src.getHeight() > icon.getHeight())
+		{
+			double r2 = (double) (icon.getHeight()) / src.getHeight();
+			if (r2 < ratio)
+				ratio = r2;
+		}
+		else
+		{
+			double r2 = (int) (icon.getHeight() / src.getHeight());
+			if (r2 < ratio)
+				ratio = r2;
+		}
+		return ratio;
+	}
+
+	/*************************************************************************
+	 * Converts a BufferedImage into a ByteBuffer of pixel data.
+	 *
+	 * @param image
+	 *            The image to convert.
+	 *
+	 * @return A ByteBuffer that contains the pixel data of the supplied image.
+	 *************************************************************************/
+	public static ByteBuffer convertToByteBuffer(BufferedImage image)
+	{
+		byte[] buffer = new byte[image.getWidth() * image.getHeight() * 4];
+		int counter = 0;
+		for (int i = 0; i < image.getHeight(); i++)
+			for (int j = 0; j < image.getWidth(); j++)
+			{
+				int colorSpace = image.getRGB(j, i);
+				buffer[counter + 0] = (byte) ((colorSpace << 8) >> 24);
+				buffer[counter + 1] = (byte) ((colorSpace << 16) >> 24);
+				buffer[counter + 2] = (byte) ((colorSpace << 24) >> 24);
+				buffer[counter + 3] = (byte) (colorSpace >> 24);
+				counter += 4;
+			}
+		return ByteBuffer.wrap(buffer);
+	}
+}
\ No newline at end of file
diff --git a/libraries/launcher/org/multimc/Launcher.java b/libraries/launcher/org/multimc/Launcher.java
new file mode 100644
index 00000000..1aa2b21f
--- /dev/null
+++ b/libraries/launcher/org/multimc/Launcher.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.multimc;
+
+public interface Launcher
+{
+	abstract int launch(ParamBucket params);
+}
diff --git a/libraries/launcher/org/multimc/LegacyFrame.java b/libraries/launcher/org/multimc/LegacyFrame.java
new file mode 100644
index 00000000..a081f3ae
--- /dev/null
+++ b/libraries/launcher/org/multimc/LegacyFrame.java
@@ -0,0 +1,112 @@
+package org.multimc;/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import net.minecraft.Launcher;
+
+import javax.imageio.ImageIO;
+import java.applet.Applet;
+import java.awt.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class LegacyFrame extends Frame implements WindowListener
+{
+    private Launcher appletWrap = null;
+    public LegacyFrame(String title)
+    {
+        super ( title );
+        BufferedImage image;
+        try {
+            image = ImageIO.read ( new File ( "icon.png" ) );
+            setIconImage ( image );
+        } catch ( IOException e ) {
+            e.printStackTrace();
+        }
+        this.addWindowListener ( this );
+    }
+
+    public void start ( Applet mcApplet, String user, String session, Dimension winSize, boolean maximize )
+    {
+        try {
+            appletWrap = new Launcher( mcApplet, new URL ( "http://www.minecraft.net/game" ) );
+        } catch ( MalformedURLException ignored ) {}
+        appletWrap.setParameter ( "username", user );
+        appletWrap.setParameter ( "sessionid", session );
+        appletWrap.setParameter ( "stand-alone", "true" ); // Show the quit button.
+		appletWrap.setParameter ( "demo", "false" );
+		appletWrap.setParameter("fullscreen", "false");
+        mcApplet.setStub(appletWrap);
+        this.add ( appletWrap );
+        appletWrap.setPreferredSize ( winSize );
+        this.pack();
+        this.setLocationRelativeTo ( null );
+        this.setResizable ( true );
+        if ( maximize ) {
+            this.setExtendedState ( MAXIMIZED_BOTH );
+        }
+        validate();
+        appletWrap.init();
+        appletWrap.start();
+        setVisible ( true );
+    }
+
+    @Override
+    public void windowActivated ( WindowEvent e ) {}
+
+    @Override
+    public void windowClosed ( WindowEvent e ) {}
+
+    @Override
+    public void windowClosing ( WindowEvent e )
+    {
+        new Thread() {
+            public void run() {
+                try {
+                    Thread.sleep ( 30000L );
+                } catch ( InterruptedException localInterruptedException ) {
+                    localInterruptedException.printStackTrace();
+                }
+                System.out.println ( "FORCING EXIT!" );
+                System.exit ( 0 );
+            }
+        }
+        .start();
+
+        if ( appletWrap != null ) {
+            appletWrap.stop();
+            appletWrap.destroy();
+        }
+        // old minecraft versions can hang without this >_<
+        System.exit ( 0 );
+    }
+
+    @Override
+    public void windowDeactivated ( WindowEvent e ) {}
+
+    @Override
+    public void windowDeiconified ( WindowEvent e ) {}
+
+    @Override
+    public void windowIconified ( WindowEvent e ) {}
+
+    @Override
+    public void windowOpened ( WindowEvent e ) {}
+}
diff --git a/libraries/launcher/org/multimc/NotFoundException.java b/libraries/launcher/org/multimc/NotFoundException.java
new file mode 100644
index 00000000..fe154a2f
--- /dev/null
+++ b/libraries/launcher/org/multimc/NotFoundException.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.multimc;
+
+public class NotFoundException extends Exception
+{
+}
diff --git a/libraries/launcher/org/multimc/ParamBucket.java b/libraries/launcher/org/multimc/ParamBucket.java
new file mode 100644
index 00000000..2e197d9f
--- /dev/null
+++ b/libraries/launcher/org/multimc/ParamBucket.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.multimc;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ParamBucket
+{
+	public void add(String key, String value)
+	{
+		List<String> coll = null;
+		if(!m_params.containsKey(key))
+		{
+			coll = new ArrayList<String>();
+			m_params.put(key, coll);
+		}
+		else
+		{
+			coll = m_params.get(key);
+		}
+		coll.add(value);
+	}
+
+	public List<String> all(String key) throws NotFoundException
+	{
+		if(!m_params.containsKey(key))
+			throw new NotFoundException();
+		return m_params.get(key);
+	}
+
+	public List<String> allSafe(String key, List<String> def)
+	{
+		if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
+		{
+			return def;
+		}
+		return m_params.get(key);
+	}
+
+	public List<String> allSafe(String key)
+	{
+		return allSafe(key, new ArrayList<String>());
+	}
+
+	public String first(String key) throws NotFoundException
+	{
+		List<String> list = all(key);
+		if(list.size() < 1)
+		{
+			throw new NotFoundException();
+		}
+		return list.get(0);
+	}
+
+	public String firstSafe(String key, String def)
+	{
+		if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
+		{
+			return def;
+		}
+		return m_params.get(key).get(0);
+	}
+
+	public String firstSafe(String key)
+	{
+		return firstSafe(key, "");
+	}
+
+	private HashMap<String, List<String>> m_params = new HashMap<String, List<String>>();
+}
diff --git a/libraries/logic/wonko/WonkoUtil.h b/libraries/launcher/org/multimc/ParseException.java
index b618ab71..d9e8e53e 100644
--- a/libraries/logic/wonko/WonkoUtil.h
+++ b/libraries/launcher/org/multimc/ParseException.java
@@ -1,4 +1,5 @@
-/* Copyright 2015 MultiMC Contributors
+/*
+ * Copyright 2012-2014 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,9 @@
  * limitations under the License.
  */
 
-#pragma once
+package org.multimc;
 
-#include "multimc_logic_export.h"
-
-class QUrl;
-class QString;
-class QDir;
-
-namespace Wonko
+public class ParseException extends java.lang.Exception
 {
-MULTIMC_LOGIC_EXPORT QUrl rootUrl();
-MULTIMC_LOGIC_EXPORT QUrl indexUrl();
-MULTIMC_LOGIC_EXPORT QUrl versionListUrl(const QString &uid);
-MULTIMC_LOGIC_EXPORT QUrl versionUrl(const QString &uid, const QString &version);
-MULTIMC_LOGIC_EXPORT QDir localWonkoDir();
+
 }
diff --git a/libraries/launcher/org/multimc/Utils.java b/libraries/launcher/org/multimc/Utils.java
new file mode 100644
index 00000000..32cf7919
--- /dev/null
+++ b/libraries/launcher/org/multimc/Utils.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.multimc;
+
+import java.io.*;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class Utils
+{
+	/**
+	 * Combine two parts of a path.
+	 *
+	 * @param path1
+	 * @param path2
+	 * @return the paths, combined
+	 */
+	public static String combine(String path1, String path2)
+	{
+		File file1 = new File(path1);
+		File file2 = new File(file1, path2);
+		return file2.getPath();
+	}
+
+	/**
+	 * Join a list of strings into a string using a separator!
+	 *
+	 * @param strings   the string list to join
+	 * @param separator the glue
+	 * @return the result.
+	 */
+	public static String join(List<String> strings, String separator)
+	{
+		StringBuilder sb = new StringBuilder();
+		String sep = "";
+		for (String s : strings)
+		{
+			sb.append(sep).append(s);
+			sep = separator;
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * Adds the specified library to the classpath
+	 *
+	 * @param s the path to add
+	 * @throws Exception
+	 */
+	public static void addToClassPath(String s) throws Exception
+	{
+		File f = new File(s);
+		URL u = f.toURI().toURL();
+		URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+		Class urlClass = URLClassLoader.class;
+		Method method = urlClass.getDeclaredMethod("addURL", new Class[]{URL.class});
+		method.setAccessible(true);
+		method.invoke(urlClassLoader, new Object[]{u});
+	}
+
+	/**
+	 * Adds many libraries to the classpath
+	 *
+	 * @param jars the paths to add
+	 */
+	public static boolean addToClassPath(List<String> jars)
+	{
+		boolean pure = true;
+		// initialize the class path
+		for (String jar : jars)
+		{
+			try
+			{
+				Utils.addToClassPath(jar);
+			} catch (Exception e)
+			{
+				System.err.println("Unable to load: " + jar);
+				e.printStackTrace(System.err);
+				pure = false;
+			}
+		}
+		return pure;
+	}
+
+	/**
+	 * Adds the specified path to the java library path
+	 *
+	 * @param pathToAdd the path to add
+	 * @throws Exception
+	 */
+	@Deprecated
+	public static void addLibraryPath(String pathToAdd) throws Exception
+	{
+		final Field usrPathsField = ClassLoader.class.getDeclaredField("usr_paths");
+		usrPathsField.setAccessible(true);
+
+		//get array of paths
+		final String[] paths = (String[]) usrPathsField.get(null);
+
+		//check if the path to add is already present
+		for (String path : paths)
+		{
+			if (path.equals(pathToAdd))
+			{
+				return;
+			}
+		}
+
+		//add the new path
+		final String[] newPaths = Arrays.copyOf(paths, paths.length + 1);
+		newPaths[newPaths.length - 1] = pathToAdd;
+		usrPathsField.set(null, newPaths);
+	}
+
+	/**
+	 * Finds a field that looks like a Minecraft base folder in a supplied class
+	 *
+	 * @param mc the class to scan
+	 */
+	public static Field getMCPathField(Class<?> mc)
+	{
+		Field[] fields = mc.getDeclaredFields();
+
+		for (Field f : fields)
+		{
+			if (f.getType() != File.class)
+			{
+				// Has to be File
+				continue;
+			}
+			if (f.getModifiers() != (Modifier.PRIVATE + Modifier.STATIC))
+			{
+				// And Private Static.
+				continue;
+			}
+			return f;
+		}
+		return null;
+	}
+
+	/**
+	 * Log to the MultiMC console
+	 *
+	 * @param message A String containing the message
+	 * @param level   A String containing the level name. See MinecraftLauncher::getLevel()
+	 */
+	public static void log(String message, String level)
+	{
+		// Kinda dirty
+		String tag = "!![" + level + "]!";
+		System.out.println(tag + message.replace("\n", "\n" + tag));
+	}
+
+	public static void log(String message)
+	{
+		log(message, "MultiMC");
+	}
+
+	public static void log()
+	{
+		System.out.println();
+	}
+
+	/**
+	 * Pushes bytes from in to out. Closes both streams no matter what.
+	 * @param in the input stream
+	 * @param out the output stream
+	 * @throws IOException
+	 */
+	private static void copyStream(InputStream in, OutputStream out) throws IOException
+	{
+		try
+		{
+		byte[] buffer = new byte[4096];
+		int len;
+
+		while((len = in.read(buffer)) >= 0)
+			out.write(buffer, 0, len);
+		} finally
+		{
+			in.close();
+			out.close();
+		}
+	}
+
+	/**
+	 * Replace a 'target' string 'suffix' with 'replacement'
+	 */
+	public static String replaceSuffix (String target, String suffix, String replacement)
+	{
+		if (!target.endsWith(suffix))
+		{
+			return target;
+		}
+		String prefix = target.substring(0, target.length() - suffix.length());
+		return prefix + replacement;
+	}
+
+	/**
+	 * Unzip zip file with natives 'source' into the folder 'targetFolder'
+	 *
+	 * Contains a hack for OSX. Yay.
+	 * @param source
+	 * @param targetFolder
+	 * @throws IOException
+	 */
+	public static void unzipNatives(File source, File targetFolder) throws IOException
+	{
+		ZipFile zip = new ZipFile(source);
+
+		boolean applyHacks = false;
+		String[] javaVersionElements = System.getProperty("java.version").split("[.\\-+]");
+		int major = Integer.parseInt(javaVersionElements[0]);
+		if(major == 1)
+		{
+			major = Integer.parseInt(javaVersionElements[1]);
+		}
+		if (major >= 8)
+		{
+			applyHacks = true;
+		}
+
+		try
+		{
+			Enumeration entries = zip.entries();
+
+			while (entries.hasMoreElements())
+			{
+				ZipEntry entry = (ZipEntry) entries.nextElement();
+
+				String entryName = entry.getName();
+				String fileName = entryName;
+				if(applyHacks)
+				{
+					fileName = replaceSuffix(entryName, ".jnilib", ".dylib");
+				}
+				File targetFile = new File(targetFolder, fileName);
+				if (targetFile.getParentFile() != null)
+				{
+					targetFile.getParentFile().mkdirs();
+				}
+
+				if (entry.isDirectory())
+					continue;
+
+				copyStream(zip.getInputStream(entry), new BufferedOutputStream(new FileOutputStream(targetFile)));
+			}
+		} finally
+		{
+			zip.close();
+		}
+	}
+}
+
diff --git a/libraries/launcher/org/multimc/legacy/LegacyLauncher.java b/libraries/launcher/org/multimc/legacy/LegacyLauncher.java
new file mode 100644
index 00000000..347bb1a2
--- /dev/null
+++ b/libraries/launcher/org/multimc/legacy/LegacyLauncher.java
@@ -0,0 +1,175 @@
+package org.multimc.legacy;/*
+ * Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.multimc.*;
+
+import java.applet.Applet;
+import java.awt.*;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+public class LegacyLauncher implements Launcher
+{
+	@Override
+	public int launch(ParamBucket params)
+	{
+		String userName, sessionId, windowTitle, windowParams, lwjgl;
+		String mainClass = "net.minecraft.client.Minecraft";
+		try
+		{
+			userName = params.first("userName");
+			sessionId = params.first("sessionId");
+			windowTitle = params.first("windowTitle");
+			windowParams = params.first("windowParams");
+			lwjgl = params.first("lwjgl");
+		} catch (NotFoundException e)
+		{
+			System.err.println("Not enough arguments.");
+			return -1;
+		}
+
+		String cwd = System.getProperty("user.dir");
+		Dimension winSize = new Dimension(854, 480);
+		boolean maximize = false;
+
+		String[] dimStrings = windowParams.split("x");
+
+		if (windowParams.equalsIgnoreCase("max"))
+		{
+			maximize = true;
+		}
+		else if (dimStrings.length == 2)
+		{
+			try
+			{
+				winSize = new Dimension(Integer.parseInt(dimStrings[0]), Integer.parseInt(dimStrings[1]));
+			} catch (NumberFormatException ignored) {}
+		}
+
+		File binDir = new File(cwd, "bin");
+		File lwjglDir;
+		if (lwjgl.equalsIgnoreCase("Mojang"))
+		{
+			lwjglDir = binDir;
+		}
+		else
+		{
+			lwjglDir = new File(lwjgl);
+		}
+
+		URL[] classpath;
+		{
+			try
+			{
+				classpath = new URL[]
+				{
+					new File(binDir, "minecraft.jar").toURI().toURL(),
+					new File(lwjglDir, "lwjgl.jar").toURI().toURL(),
+					new File(lwjglDir, "lwjgl_util.jar").toURI().toURL(),
+					new File(lwjglDir, "jinput.jar").toURI().toURL(),
+				};
+			} catch (MalformedURLException e)
+			{
+				System.err.println("Class path entry is badly formed:");
+				e.printStackTrace(System.err);
+				return -1;
+			}
+		}
+
+		String nativesDir = new File(lwjglDir, "natives").toString();
+
+		System.setProperty("org.lwjgl.librarypath", nativesDir);
+		System.setProperty("net.java.games.input.librarypath", nativesDir);
+
+		// print the pretty things
+		{
+			Utils.log("Main Class:");
+			Utils.log("  " + mainClass);
+			Utils.log();
+
+			Utils.log("Class Path:");
+			for (URL s : classpath)
+			{
+				Utils.log("  " + s);
+			}
+			Utils.log();
+
+			Utils.log("Native Path:");
+			Utils.log("  " + nativesDir);
+			Utils.log();
+		}
+
+		URLClassLoader cl = new URLClassLoader(classpath, LegacyLauncher.class.getClassLoader());
+
+		// Get the Minecraft Class and set the base folder
+		Class<?> mc;
+		try
+		{
+			mc = cl.loadClass(mainClass);
+
+			Field f = Utils.getMCPathField(mc);
+
+			if (f == null)
+			{
+				System.err.println("Could not find Minecraft path field. Launch failed.");
+				return -1;
+			}
+
+			f.setAccessible(true);
+			f.set(null, new File(cwd));
+		} catch (Exception e)
+		{
+			System.err.println("Could not set base folder. Failed to find/access Minecraft main class:");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+
+		System.setProperty("minecraft.applet.TargetDirectory", cwd);
+
+		String[] mcArgs = new String[2];
+		mcArgs[0] = userName;
+		mcArgs[1] = sessionId;
+
+		Utils.log("Launching with applet wrapper...");
+		try
+		{
+			Class<?> MCAppletClass = cl.loadClass("net.minecraft.client.MinecraftApplet");
+			Applet mcappl = (Applet) MCAppletClass.newInstance();
+			LegacyFrame mcWindow = new LegacyFrame(windowTitle);
+			mcWindow.start(mcappl, userName, sessionId, winSize, maximize);
+		} catch (Exception e)
+		{
+			Utils.log("Applet wrapper failed:", "Error");
+			e.printStackTrace(System.err);
+			Utils.log();
+			Utils.log("Falling back to compatibility mode.");
+			try
+			{
+				mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
+			} catch (Exception e1)
+			{
+				Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
+				e1.printStackTrace(System.err);
+				return -1;
+			}
+		}
+
+		return 0;
+	}
+}
diff --git a/libraries/launcher/org/multimc/onesix/OneSixLauncher.java b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
new file mode 100644
index 00000000..179df0ee
--- /dev/null
+++ b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -0,0 +1,367 @@
+/* Copyright 2012-2014 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.multimc.onesix;
+
+import org.multimc.*;
+
+import java.applet.Applet;
+import java.io.File;
+import java.awt.*;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+public class OneSixLauncher implements Launcher
+{
+	// parameters, separated from ParamBucket
+	private List<String> libraries;
+	private List<String> extlibs;
+	private List<String> extlibs32;
+	private List<String> extlibs64;
+	private List<String> mcparams;
+	private List<String> mods;
+	private List<String> jarmods;
+	private List<String> coremods;
+	private List<String> traits;
+	private String appletClass;
+	private String mainClass;
+	private String nativePath;
+	private String userName, sessionId;
+	private String windowTitle;
+	private String windowParams;
+
+	// secondary parameters
+	private Dimension winSize;
+	private boolean maximize;
+	private String cwd;
+
+	// the much abused system classloader, for convenience (for further abuse)
+	private ClassLoader cl;
+
+	private void processParams(ParamBucket params) throws NotFoundException
+	{
+		libraries = params.all("cp");
+		extlibs = params.allSafe("ext", new ArrayList<String>());
+		extlibs32 = params.allSafe("ext32", new ArrayList<String>());
+		extlibs64 = params.allSafe("ext64", new ArrayList<String>());
+
+		// Unify the extracted native libs according to actual system architecture
+		String property = System.getProperty("os.arch");
+		boolean is_64 = property.equalsIgnoreCase("x86_64") || property.equalsIgnoreCase("amd64");
+		if(is_64)
+		{
+			extlibs.addAll(extlibs64);
+		}
+		else
+		{
+			extlibs.addAll(extlibs32);
+		}
+
+		mcparams = params.allSafe("param", new ArrayList<String>() );
+		mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
+		appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
+		mods = params.allSafe("mod", new ArrayList<String>());
+		jarmods = params.allSafe("jarmod", new ArrayList<String>());
+		coremods = params.allSafe("coremod", new ArrayList<String>());
+		traits = params.allSafe("traits", new ArrayList<String>());
+		nativePath = params.first("natives");
+
+		userName = params.first("userName");
+		sessionId = params.first("sessionId");
+		windowTitle = params.firstSafe("windowTitle", "Minecraft");
+		windowParams = params.firstSafe("windowParams", "854x480");
+
+		cwd = System.getProperty("user.dir");
+		winSize = new Dimension(854, 480);
+		maximize = false;
+
+		String[] dimStrings = windowParams.split("x");
+
+		if (windowParams.equalsIgnoreCase("max"))
+		{
+			maximize = true;
+		}
+		else if (dimStrings.length == 2)
+		{
+			try
+			{
+				winSize = new Dimension(Integer.parseInt(dimStrings[0]), Integer.parseInt(dimStrings[1]));
+			} catch (NumberFormatException ignored) {}
+		}
+	}
+
+	private void printStats()
+	{
+		Utils.log("Main Class:");
+		Utils.log("  " + mainClass);
+		Utils.log();
+
+		Utils.log("Native path:");
+		Utils.log("  " + nativePath);
+		Utils.log();
+
+		Utils.log("Traits:");
+		Utils.log("  " + traits);
+		Utils.log();
+
+		Utils.log("Libraries:");
+		for (String s : libraries)
+		{
+			File f = new File(s);
+			if (f.exists())
+			{
+				Utils.log("  " + s);
+			}
+			else
+			{
+				Utils.log("  " + s + " (missing)", "Warning");
+			}
+		}
+		Utils.log();
+
+		if(mods.size() > 0)
+		{
+			Utils.log("Mods:");
+			for (String s : mods)
+			{
+				Utils.log("  " + s);
+			}
+			Utils.log();
+		}
+
+		if(coremods.size() > 0)
+		{
+			Utils.log("Core Mods:");
+			for (String s : coremods)
+			{
+				Utils.log("  " + s);
+			}
+			Utils.log();
+		}
+
+		if(jarmods.size() > 0)
+		{
+			Utils.log("Jar Mods:");
+			for (String s : jarmods)
+			{
+				Utils.log("  " + s);
+			}
+			Utils.log();
+		}
+
+		Utils.log("Params:");
+		Utils.log("  " + mcparams.toString());
+		Utils.log();
+		if(maximize)
+			Utils.log("Window size: max (if available)");
+		else
+			Utils.log("Window size: " + Integer.toString(winSize.width) + " x " + Integer.toString(winSize.height));
+		Utils.log();
+	}
+
+	int legacyLaunch()
+	{
+		// Get the Minecraft Class and set the base folder
+		Class<?> mc;
+		try
+		{
+			mc = cl.loadClass(mainClass);
+
+			Field f = Utils.getMCPathField(mc);
+
+			if (f == null)
+			{
+				System.err.println("Could not find Minecraft path field.");
+			}
+			else
+			{
+				f.setAccessible(true);
+				f.set(null, new File(cwd));
+			}
+		} catch (Exception e)
+		{
+			System.err.println("Could not set base folder. Failed to find/access Minecraft main class:");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+
+		System.setProperty("minecraft.applet.TargetDirectory", cwd);
+
+		String[] mcArgs = new String[2];
+		mcArgs[0] = userName;
+		mcArgs[1] = sessionId;
+
+		Utils.log("Launching with applet wrapper...");
+		try
+		{
+			Class<?> MCAppletClass = cl.loadClass(appletClass);
+			Applet mcappl = (Applet) MCAppletClass.newInstance();
+			LegacyFrame mcWindow = new LegacyFrame(windowTitle);
+			mcWindow.start(mcappl, userName, sessionId, winSize, maximize);
+		} catch (Exception e)
+		{
+			Utils.log("Applet wrapper failed:", "Error");
+			e.printStackTrace(System.err);
+			Utils.log();
+			Utils.log("Falling back to compatibility mode.");
+			try
+			{
+				mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
+			} catch (Exception e1)
+			{
+				Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
+				e1.printStackTrace(System.err);
+				return -1;
+			}
+		}
+		return 0;
+	}
+
+	int launchWithMainClass()
+	{
+		// window size, title and state, onesix
+		if (maximize)
+		{
+			// FIXME: there is no good way to maximize the minecraft window in onesix.
+			// the following often breaks linux screen setups
+			// mcparams.add("--fullscreen");
+		}
+		else
+		{
+			mcparams.add("--width");
+			mcparams.add(Integer.toString(winSize.width));
+			mcparams.add("--height");
+			mcparams.add(Integer.toString(winSize.height));
+		}
+
+		System.setProperty("minecraft.applet.TargetDirectory", cwd);
+
+		// Get the Minecraft Class.
+		Class<?> mc;
+		try
+		{
+			mc = cl.loadClass(mainClass);
+		} catch (ClassNotFoundException e)
+		{
+			System.err.println("Failed to find Minecraft main class:");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+
+		// get the main method.
+		Method meth;
+		try
+		{
+			meth = mc.getMethod("main", String[].class);
+		} catch (NoSuchMethodException e)
+		{
+			System.err.println("Failed to acquire the main method:");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+		// init params for the main method to chomp on.
+		String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
+		try
+		{
+			// static method doesn't have an instance
+			meth.invoke(null, (Object) paramsArray);
+		} catch (Exception e)
+		{
+			System.err.println("Failed to start Minecraft:");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+		return 0;
+	}
+
+	@Override
+	public int launch(ParamBucket params)
+	{
+		// get and process the launch script params
+		try
+		{
+			processParams(params);
+		} catch (NotFoundException e)
+		{
+			System.err.println("Not enough arguments.");
+			e.printStackTrace(System.err);
+			return -1;
+		}
+
+		// add libraries to classpath
+		if(!Utils.addToClassPath(libraries))
+		{
+			System.err.println("Halting launch due to previous errors.");
+			return -1;
+		}
+
+		// print the pretty things
+		printStats();
+
+		// extract native libs (depending on platform here... java!)
+		Utils.log("Preparing native libraries...");
+		for(String extlib: extlibs)
+		{
+			try
+			{
+				File extlibf = new File(extlib);
+				Utils.log("Extracting " + extlibf.getName());
+				Utils.unzipNatives(extlibf, new File(nativePath));
+			} catch (IOException e)
+			{
+				System.err.println("Failed to extract native library:");
+				e.printStackTrace(System.err);
+				return -1;
+			}
+		}
+		Utils.log();
+
+		// set the native libs path... the brute force way
+		try
+		{
+			System.setProperty("java.library.path", nativePath);
+			System.setProperty("org.lwjgl.librarypath", nativePath);
+			System.setProperty("net.java.games.input.librarypath", nativePath);
+			// by the power of reflection, initialize native libs again. DIRTY!
+			// this is SO BAD. imagine doing that to ld
+			Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
+			fieldSysPath.setAccessible( true );
+			fieldSysPath.set( null, null );
+		}
+		catch (Exception e)
+		{
+			System.err.println("Failed to set the native library path:");
+			e.printStackTrace(System.err);
+			System.err.println("Minecraft might fail to launch...");
+		}
+
+		// grab the system classloader and ...
+		cl = ClassLoader.getSystemClassLoader();
+
+		if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch") )
+		{
+			// legacy launch uses the applet wrapper
+			return legacyLaunch();
+		}
+		else
+		{
+			// normal launch just calls main()
+			return launchWithMainClass();
+		}
+	}
+}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/Application.java b/libraries/launcher/org/simplericity/macify/eawt/Application.java
new file mode 100644
index 00000000..153bb9ee
--- /dev/null
+++ b/libraries/launcher/org/simplericity/macify/eawt/Application.java
@@ -0,0 +1,176 @@
+package org.simplericity.macify.eawt;
+
+/*
+ * Copyright 2007 Eirik Bjorsnos.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+/**
+ * The Macify Library API interface provides integration with the OS X platform for Java Applications.
+ * The API includes a facade to the
+ * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/index.html">
+ * Apple Java Extensions API
+ * </a>.
+ * Additionally, it provides access to several useful methods in the Cocoa NSApplication API.
+ *
+ * The default implementation of this interface is {@link org.simplericity.macify.eawt.DefaultApplication}.
+ */
+public interface Application {
+
+    static int REQUEST_USER_ATTENTION_TYPE_CRITICAL = 1 ;
+    static int REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL = 2 ;
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addAboutMenuItem()">
+     * Apple's API
+     * </a>.
+     */
+    void addAboutMenuItem();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addApplicationListener(com.apple.eawt.ApplicationListener)">
+     * Apple's API
+     * </a>.
+     */
+    void addApplicationListener(ApplicationListener applicationListener);
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addPreferencesMenuItem()">
+     * Apple's API
+     * </a>.
+     */
+    void addPreferencesMenuItem();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledAboutMenu()">
+     * Apple's API
+     * </a>.
+     */
+    boolean getEnabledAboutMenu();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledPreferencesMenu()">
+     * Apple's API
+     * </a>.
+     */
+    boolean getEnabledPreferencesMenu();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#isAboutMenuItemPresent()">
+     * Apple's API
+     * </a>.
+     */
+    boolean isAboutMenuItemPresent();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#isPreferencesMenuItemPresent()">
+     * Apple's API
+     * </a>.
+     */
+    boolean isPreferencesMenuItemPresent();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removeAboutMenuItem()">
+     * Apple's API
+     * </a>.
+     */
+    void removeAboutMenuItem();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removeApplicationListener(com.apple.eawt.ApplicationListener)">
+     * Apple's API
+     * </a>.
+     */
+    void removeApplicationListener(ApplicationListener applicationListener);
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removePreferencesMenuItem()">
+     * Apple's API
+     * </a>.
+     */
+    void removePreferencesMenuItem();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledAboutMenu()">
+     * Apple's API
+     * </a>.
+     */
+    void setEnabledAboutMenu(boolean enabled);
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledPreferencesMenu()">
+     * Apple's API
+     * </a>.
+     */
+    void setEnabledPreferencesMenu(boolean enabled);
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getMouseLocationOnScreen()">
+     * Apple's API
+     * </a>.
+     */
+    Point getMouseLocationOnScreen();
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/index.html#//apple_ref/doc/uid/TP40004004">
+     * Apple's NSApplication Class Reference
+     * </a>.
+     * @param type on of {@link #REQUEST_USER_ATTENTION_TYPE_CRITICAL} or {@link #REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL}.
+     */
+    int requestUserAttention(int type);
+
+    /**
+     * See
+     * <a href="http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/index.html#//apple_ref/doc/uid/TP40004004">
+     * Apple's NSApplication Class Reference
+     * </a>
+     */
+    void cancelUserAttentionRequest(int request);
+
+    /**
+     * Update the application's icon image
+     * @param image
+     */
+    void setApplicationIconImage(BufferedImage image);
+
+    /**
+     * Get the application's icon image.
+     */
+    BufferedImage getApplicationIconImage();
+
+    /**
+     * Determines whether the application is running on a Mac AND the Apple Extensions API classes are available.
+     * @return
+     */
+    boolean isMac();
+
+
+}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
new file mode 100644
index 00000000..e9c3db7d
--- /dev/null
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
@@ -0,0 +1,48 @@
+package org.simplericity.macify.eawt;
+
+/*
+ * Copyright 2007 Eirik Bjorsnos.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class ApplicationAdapter implements ApplicationListener {
+
+    public void handleQuit(ApplicationEvent event) {
+        
+    }
+
+    public void handleAbout(ApplicationEvent event) {
+
+    }
+
+    public void handleOpenApplication(ApplicationEvent event) {
+
+    }
+
+    public void handleOpenFile(ApplicationEvent event) {
+
+    }
+
+    public void handlePreferences(ApplicationEvent event) {
+
+    }
+
+    public void handlePrintFile(ApplicationEvent event) {
+
+    }
+
+    public void handleReOpenApplication(ApplicationEvent event) {
+        
+    }
+}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
new file mode 100644
index 00000000..78420355
--- /dev/null
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
@@ -0,0 +1,25 @@
+package org.simplericity.macify.eawt;
+
+/*
+ * Copyright 2007 Eirik Bjorsnos.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface ApplicationEvent {
+    String getFilename();
+    boolean isHandled();
+    void setHandled(boolean handled);
+    Object getSource();
+    String toString();
+}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
new file mode 100644
index 00000000..a291bee4
--- /dev/null
+++ b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java
@@ -0,0 +1,27 @@
+package org.simplericity.macify.eawt;
+
+/*
+ * Copyright 2007 Eirik Bjorsnos.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface ApplicationListener {
+    void handleAbout(ApplicationEvent event);
+    void handleOpenApplication(ApplicationEvent event);
+    void handleOpenFile(ApplicationEvent event);
+    void handlePreferences(ApplicationEvent event);
+    void handlePrintFile(ApplicationEvent event);
+    void handleQuit(ApplicationEvent event);
+    void handleReOpenApplication(ApplicationEvent event);
+}
diff --git a/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
new file mode 100644
index 00000000..5752a350
--- /dev/null
+++ b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java
@@ -0,0 +1,418 @@
+package org.simplericity.macify.eawt;
+
+/*
+ * Copyright 2007 Eirik Bjorsnos.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.lang.reflect.*;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.MalformedURLException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Implements Application by calling the Mac OS X API through reflection.
+ * If this class is used on a non-OS X platform the operations will have no effect or they will simulate
+ * what the Apple API would do for those who manipulate state. ({@link #setEnabledAboutMenu(boolean)} etc.)
+ */
+@SuppressWarnings("unchecked")
+public class DefaultApplication implements Application {
+
+    private Object application;
+    private Class applicationListenerClass;
+
+    Map listenerMap = Collections.synchronizedMap(new HashMap<Object, Object>());
+    private boolean enabledAboutMenu = true;
+    private boolean enabledPreferencesMenu;
+    private boolean aboutMenuItemPresent = true;
+    private boolean preferencesMenuItemPresent;
+    private ClassLoader classLoader;
+
+    public DefaultApplication() {
+        try {
+            final File file = new File("/System/Library/Java");
+            if (file.exists()) {
+                ClassLoader scl = ClassLoader.getSystemClassLoader();
+                Class clc = scl.getClass();
+                if (URLClassLoader.class.isAssignableFrom(clc)) {
+                    Method addUrl = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class});
+                    addUrl.setAccessible(true);
+                    addUrl.invoke(scl, new Object[]{file.toURI().toURL()});
+                }
+            }
+
+            Class appClass = Class.forName("com.apple.eawt.Application");
+            application = appClass.getMethod("getApplication", new Class[0]).invoke(null, new Object[0]);
+            applicationListenerClass = Class.forName("com.apple.eawt.ApplicationListener");
+        } catch (ClassNotFoundException e) {
+            application = null;
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public boolean isMac() {
+        return application != null;
+    }
+
+    public void addAboutMenuItem() {
+        if (isMac()) {
+            callMethod(application, "addAboutMenuItem");
+        } else {
+            this.aboutMenuItemPresent = true;
+        }
+    }
+
+    public void addApplicationListener(ApplicationListener applicationListener) {
+
+        if (!Modifier.isPublic(applicationListener.getClass().getModifiers())) {
+            throw new IllegalArgumentException("ApplicationListener must be a public class");
+        }
+        if (isMac()) {
+            Object listener = Proxy.newProxyInstance(getClass().getClassLoader(),
+                    new Class[]{applicationListenerClass},
+                    new ApplicationListenerInvocationHandler(applicationListener));
+
+            callMethod(application, "addApplicationListener", new Class[]{applicationListenerClass}, new Object[]{listener});
+            listenerMap.put(applicationListener, listener);
+        } else {
+            listenerMap.put(applicationListener, applicationListener);
+        }
+    }
+
+    public void addPreferencesMenuItem() {
+        if (isMac()) {
+            callMethod("addPreferencesMenuItem");
+        } else {
+            this.preferencesMenuItemPresent = true;
+        }
+    }
+
+    public boolean getEnabledAboutMenu() {
+        if (isMac()) {
+            return callMethod("getEnabledAboutMenu").equals(Boolean.TRUE);
+        } else {
+            return enabledAboutMenu;
+        }
+    }
+
+    public boolean getEnabledPreferencesMenu() {
+        if (isMac()) {
+            Object result = callMethod("getEnabledPreferencesMenu");
+            return result.equals(Boolean.TRUE);
+        } else {
+            return enabledPreferencesMenu;
+        }
+    }
+
+    public Point getMouseLocationOnScreen() {
+        if (isMac()) {
+            try {
+                Method method = application.getClass().getMethod("getMouseLocationOnScreen", new Class[0]);
+                return (Point) method.invoke(null, new Object[0]);
+            } catch (NoSuchMethodException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return new Point(0, 0);
+        }
+    }
+
+    public boolean isAboutMenuItemPresent() {
+        if (isMac()) {
+            return callMethod("isAboutMenuItemPresent").equals(Boolean.TRUE);
+        } else {
+            return aboutMenuItemPresent;
+        }
+    }
+
+    public boolean isPreferencesMenuItemPresent() {
+        if (isMac()) {
+            return callMethod("isPreferencesMenuItemPresent").equals(Boolean.TRUE);
+        } else {
+            return this.preferencesMenuItemPresent;
+        }
+    }
+
+    public void removeAboutMenuItem() {
+        if (isMac()) {
+            callMethod("removeAboutMenuItem");
+        } else {
+            this.aboutMenuItemPresent = false;
+        }
+    }
+
+    public synchronized void removeApplicationListener(ApplicationListener applicationListener) {
+        if (isMac()) {
+            Object listener = listenerMap.get(applicationListener);
+            callMethod(application, "removeApplicationListener", new Class[]{applicationListenerClass}, new Object[]{listener});
+
+        }
+        listenerMap.remove(applicationListener);
+    }
+
+    public void removePreferencesMenuItem() {
+        if (isMac()) {
+            callMethod("removeAboutMenuItem");
+        } else {
+            this.preferencesMenuItemPresent = false;
+        }
+    }
+
+    public void setEnabledAboutMenu(boolean enabled) {
+        if (isMac()) {
+            callMethod(application, "setEnabledAboutMenu", new Class[]{Boolean.TYPE}, new Object[]{Boolean.valueOf(enabled)});
+        } else {
+            this.enabledAboutMenu = enabled;
+        }
+    }
+
+    public void setEnabledPreferencesMenu(boolean enabled) {
+        if (isMac()) {
+            callMethod(application, "setEnabledPreferencesMenu", new Class[]{Boolean.TYPE}, new Object[]{Boolean.valueOf(enabled)});
+        } else {
+            this.enabledPreferencesMenu = enabled;
+        }
+
+    }
+
+    public int requestUserAttention(int type) {
+        if (type != REQUEST_USER_ATTENTION_TYPE_CRITICAL && type != REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL) {
+            throw new IllegalArgumentException("Requested user attention type is not allowed: " + type);
+        }
+        try {
+            Object application = getNSApplication();
+            Field critical = application.getClass().getField("UserAttentionRequestCritical");
+            Field informational = application.getClass().getField("UserAttentionRequestInformational");
+            Field actual = type == REQUEST_USER_ATTENTION_TYPE_CRITICAL ? critical : informational;
+
+            return ((Integer) application.getClass().getMethod("requestUserAttention", new Class[]{Integer.TYPE}).invoke(application, new Object[]{actual.get(null)})).intValue();
+
+        } catch (ClassNotFoundException e) {
+            return -1;
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void cancelUserAttentionRequest(int request) {
+        try {
+            Object application = getNSApplication();
+            application.getClass().getMethod("cancelUserAttentionRequest", new Class[]{Integer.TYPE}).invoke(application, new Object[]{new Integer(request)});
+        } catch (ClassNotFoundException e) {
+            // Nada
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Object getNSApplication() throws ClassNotFoundException {
+        try {
+            Class applicationClass = Class.forName("com.apple.cocoa.application.NSApplication");
+            return applicationClass.getMethod("sharedApplication", new Class[0]).invoke(null, new Object[0]);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void setApplicationIconImage(BufferedImage image) {
+        if (isMac()) {
+            try {
+                Method setDockIconImage = application.getClass().getMethod("setDockIconImage", Image.class);
+
+                try {
+                    setDockIconImage.invoke(application, image);
+                } catch (IllegalAccessException e) {
+
+                } catch (InvocationTargetException e) {
+
+                }
+            } catch (NoSuchMethodException mnfe) {
+
+
+                ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                try {
+                    ImageIO.write(image, "png", stream);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+
+                try {
+                    Class nsDataClass = Class.forName("com.apple.cocoa.foundation.NSData");
+                    Constructor constructor = nsDataClass.getConstructor(new Class[]{new byte[0].getClass()});
+
+                    Object nsData = constructor.newInstance(new Object[]{stream.toByteArray()});
+
+                    Class nsImageClass = Class.forName("com.apple.cocoa.application.NSImage");
+                    Object nsImage = nsImageClass.getConstructor(new Class[]{nsDataClass}).newInstance(new Object[]{nsData});
+
+                    Object application = getNSApplication();
+
+                    application.getClass().getMethod("setApplicationIconImage", new Class[]{nsImageClass}).invoke(application, new Object[]{nsImage});
+
+                } catch (ClassNotFoundException e) {
+
+                } catch (NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                } catch (InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                } catch (InstantiationException e) {
+                    throw new RuntimeException(e);
+                }
+
+            }
+
+        }
+    }
+
+    public BufferedImage getApplicationIconImage() {
+        if (isMac()) {
+
+            try {
+                Method getDockIconImage = application.getClass().getMethod("getDockIconImage");
+                try {
+                    return (BufferedImage) getDockIconImage.invoke(application);
+                } catch (IllegalAccessException e) {
+
+                } catch (InvocationTargetException e) {
+
+                }
+            } catch (NoSuchMethodException nsme) {
+
+                try {
+                    Class nsDataClass = Class.forName("com.apple.cocoa.foundation.NSData");
+                    Class nsImageClass = Class.forName("com.apple.cocoa.application.NSImage");
+                    Object application = getNSApplication();
+                    Object nsImage = application.getClass().getMethod("applicationIconImage", new Class[0]).invoke(application, new Object[0]);
+
+                    Object nsData = nsImageClass.getMethod("TIFFRepresentation", new Class[0]).invoke(nsImage, new Object[0]);
+
+                    Integer length = (Integer) nsDataClass.getMethod("length", new Class[0]).invoke(nsData, new Object[0]);
+                    byte[] bytes = (byte[]) nsDataClass.getMethod("bytes", new Class[]{Integer.TYPE, Integer.TYPE}).invoke(nsData, new Object[]{Integer.valueOf(0), length});
+
+                    BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
+                    return image;
+
+                } catch (ClassNotFoundException e) {
+                    e.printStackTrace();
+                } catch (NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                } catch (InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+        }
+
+        return null;
+    }
+
+    private Object callMethod(String methodname) {
+        return callMethod(application, methodname, new Class[0], new Object[0]);
+    }
+
+    private Object callMethod(Object object, String methodname) {
+        return callMethod(object, methodname, new Class[0], new Object[0]);
+    }
+
+    private Object callMethod(Object object, String methodname, Class[] classes, Object[] arguments) {
+        try {
+            if (classes == null) {
+                classes = new Class[arguments.length];
+                for (int i = 0; i < classes.length; i++) {
+                    classes[i] = arguments[i].getClass();
+
+                }
+            }
+            Method addListnerMethod = object.getClass().getMethod(methodname, classes);
+            return addListnerMethod.invoke(object, arguments);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    class ApplicationListenerInvocationHandler implements InvocationHandler {
+        private ApplicationListener applicationListener;
+
+        ApplicationListenerInvocationHandler(ApplicationListener applicationListener) {
+            this.applicationListener = applicationListener;
+        }
+
+        public Object invoke(Object object, Method appleMethod, Object[] objects) throws Throwable {
+
+            ApplicationEvent event = createApplicationEvent(objects[0]);
+            try {
+                Method method = applicationListener.getClass().getMethod(appleMethod.getName(), new Class[]{ApplicationEvent.class});
+                return method.invoke(applicationListener, new Object[]{event});
+            } catch (NoSuchMethodException e) {
+                if (appleMethod.getName().equals("equals") && objects.length == 1) {
+                    return Boolean.valueOf(object == objects[0]);
+                }
+                return null;
+            }
+        }
+    }
+
+    private ApplicationEvent createApplicationEvent(final Object appleApplicationEvent) {
+        return (ApplicationEvent) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ApplicationEvent.class}, new InvocationHandler() {
+            public Object invoke(Object o, Method method, Object[] objects) throws Throwable {
+                return appleApplicationEvent.getClass().getMethod(method.getName(), method.getParameterTypes()).invoke(appleApplicationEvent, objects);
+            }
+        });
+    }
+}
diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus
new file mode 160000
+Subproject 5d0ffb50a526173ce58ae57136bf5d79a7e1920
diff --git a/libraries/logic/AbstractCommonModel.cpp b/libraries/logic/AbstractCommonModel.cpp
deleted file mode 100644
index 71d75829..00000000
--- a/libraries/logic/AbstractCommonModel.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "AbstractCommonModel.h"
-
-BaseAbstractCommonModel::BaseAbstractCommonModel(const Qt::Orientation orientation, QObject *parent)
-	: QAbstractListModel(parent), m_orientation(orientation)
-{
-}
-
-int BaseAbstractCommonModel::rowCount(const QModelIndex &parent) const
-{
-	return m_orientation == Qt::Horizontal ? entryCount() : size();
-}
-int BaseAbstractCommonModel::columnCount(const QModelIndex &parent) const
-{
-	return m_orientation == Qt::Horizontal ? size() : entryCount();
-}
-QVariant BaseAbstractCommonModel::data(const QModelIndex &index, int role) const
-{
-	if (!hasIndex(index.row(), index.column(), index.parent()))
-	{
-		return QVariant();
-	}
-	const int i = m_orientation == Qt::Horizontal ? index.column() : index.row();
-	const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column();
-	return formatData(i, role, get(i, entry, role));
-}
-QVariant BaseAbstractCommonModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (orientation != m_orientation && role == Qt::DisplayRole)
-	{
-		return entryTitle(section);
-	}
-	else
-	{
-		return QVariant();
-	}
-}
-bool BaseAbstractCommonModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-	const int i = m_orientation == Qt::Horizontal ? index.column() : index.row();
-	const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column();
-	const bool result = set(i, entry, role, sanetizeData(i, role, value));
-	if (result)
-	{
-		emit dataChanged(index, index, QVector<int>() << role);
-	}
-	return result;
-}
-Qt::ItemFlags BaseAbstractCommonModel::flags(const QModelIndex &index) const
-{
-	if (!hasIndex(index.row(), index.column(), index.parent()))
-	{
-		return Qt::NoItemFlags;
-	}
-
-	const int entry = m_orientation == Qt::Horizontal ? index.row() : index.column();
-	if (canSet(entry))
-	{
-		return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-	}
-	else
-	{
-		return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-	}
-}
-
-void BaseAbstractCommonModel::notifyAboutToAddObject(const int at)
-{
-	if (m_orientation == Qt::Horizontal)
-	{
-		beginInsertColumns(QModelIndex(), at, at);
-	}
-	else
-	{
-		beginInsertRows(QModelIndex(), at, at);
-	}
-}
-void BaseAbstractCommonModel::notifyObjectAdded()
-{
-	if (m_orientation == Qt::Horizontal)
-	{
-		endInsertColumns();
-	}
-	else
-	{
-		endInsertRows();
-	}
-}
-void BaseAbstractCommonModel::notifyAboutToRemoveObject(const int at)
-{
-	if (m_orientation == Qt::Horizontal)
-	{
-		beginRemoveColumns(QModelIndex(), at, at);
-	}
-	else
-	{
-		beginRemoveRows(QModelIndex(), at, at);
-	}
-}
-void BaseAbstractCommonModel::notifyObjectRemoved()
-{
-	if (m_orientation == Qt::Horizontal)
-	{
-		endRemoveColumns();
-	}
-	else
-	{
-		endRemoveRows();
-	}
-}
-
-void BaseAbstractCommonModel::notifyBeginReset()
-{
-	beginResetModel();
-}
-void BaseAbstractCommonModel::notifyEndReset()
-{
-	endResetModel();
-}
diff --git a/libraries/logic/AbstractCommonModel.h b/libraries/logic/AbstractCommonModel.h
deleted file mode 100644
index 31b86a23..00000000
--- a/libraries/logic/AbstractCommonModel.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <type_traits>
-#include <functional>
-#include <memory>
-
-class BaseAbstractCommonModel : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	explicit BaseAbstractCommonModel(const Qt::Orientation orientation, QObject *parent = nullptr);
-
-	// begin QAbstractItemModel interface
-	int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-	int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-	QVariant data(const QModelIndex &index, int role) const override;
-	QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-	bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-	Qt::ItemFlags flags(const QModelIndex &index) const override;
-	// end QAbstractItemModel interface
-
-	virtual int size() const = 0;
-	virtual int entryCount() const = 0;
-
-	virtual QVariant formatData(const int index, int role, const QVariant &data) const { return data; }
-	virtual QVariant sanetizeData(const int index, int role, const QVariant &data) const { return data; }
-
-protected:
-	virtual QVariant get(const int index, const int entry, const int role) const = 0;
-	virtual bool set(const int index, const int entry, const int role, const QVariant &value) = 0;
-	virtual bool canSet(const int entry) const = 0;
-	virtual QString entryTitle(const int entry) const = 0;
-
-	void notifyAboutToAddObject(const int at);
-	void notifyObjectAdded();
-	void notifyAboutToRemoveObject(const int at);
-	void notifyObjectRemoved();
-	void notifyBeginReset();
-	void notifyEndReset();
-
-	const Qt::Orientation m_orientation;
-};
-
-template<typename Object>
-class AbstractCommonModel : public BaseAbstractCommonModel
-{
-public:
-	explicit AbstractCommonModel(const Qt::Orientation orientation)
-		: BaseAbstractCommonModel(orientation) {}
-	virtual ~AbstractCommonModel() {}
-
-	int size() const override { return m_objects.size(); }
-	int entryCount() const override { return m_entries.size(); }
-
-	void append(const Object &object)
-	{
-		notifyAboutToAddObject(size());
-		m_objects.append(object);
-		notifyObjectAdded();
-	}
-	void prepend(const Object &object)
-	{
-		notifyAboutToAddObject(0);
-		m_objects.prepend(object);
-		notifyObjectAdded();
-	}
-	void insert(const Object &object, const int index)
-	{
-		if (index >= size())
-		{
-			prepend(object);
-		}
-		else if (index <= 0)
-		{
-			append(object);
-		}
-		else
-		{
-			notifyAboutToAddObject(index);
-			m_objects.insert(index, object);
-			notifyObjectAdded();
-		}
-	}
-	void remove(const int index)
-	{
-		notifyAboutToRemoveObject(index);
-		m_objects.removeAt(index);
-		notifyObjectRemoved();
-	}
-	Object get(const int index) const
-	{
-		return m_objects.at(index);
-	}
-
-private:
-	friend class CommonModel;
-	QVariant get(const int index, const int entry, const int role) const override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(role))
-		{
-			return QVariant();
-		}
-		return m_entries[entry].second.value(role)->get(m_objects.at(index));
-	}
-	bool set(const int index, const int entry, const int role, const QVariant &value) override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(role))
-		{
-			return false;
-		}
-		IEntry *e = m_entries[entry].second.value(role);
-		if (!e->canSet())
-		{
-			return false;
-		}
-		e->set(m_objects[index], value);
-		return true;
-	}
-	bool canSet(const int entry) const override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(Qt::EditRole))
-		{
-			return false;
-		}
-		IEntry *e = m_entries[entry].second.value(Qt::EditRole);
-		return e->canSet();
-	}
-
-	QString entryTitle(const int entry) const override
-	{
-		return m_entries.at(entry).first;
-	}
-
-private:
-	struct IEntry
-	{
-		virtual ~IEntry() {}
-		virtual void set(Object &object, const QVariant &value) = 0;
-		virtual QVariant get(const Object &object) const = 0;
-		virtual bool canSet() const = 0;
-	};
-	template<typename T>
-	struct VariableEntry : public IEntry
-	{
-		typedef T (Object::*Member);
-
-		explicit VariableEntry(Member member)
-			: m_member(member) {}
-
-		void set(Object &object, const QVariant &value) override
-		{
-			object.*m_member = value.value<T>();
-		}
-		QVariant get(const Object &object) const override
-		{
-			return QVariant::fromValue<T>(object.*m_member);
-		}
-		bool canSet() const override { return true; }
-
-	private:
-		Member m_member;
-	};
-	template<typename T>
-	struct FunctionEntry : public IEntry
-	{
-		typedef T (Object::*Getter)() const;
-		typedef void (Object::*Setter)(T);
-
-		explicit FunctionEntry(Getter getter, Setter setter)
-			: m_getter(m_getter), m_setter(m_setter) {}
-
-		void set(Object &object, const QVariant &value) override
-		{
-			object.*m_setter(value.value<T>());
-		}
-		QVariant get(const Object &object) const override
-		{
-			return QVariant::fromValue<T>(object.*m_getter());
-		}
-		bool canSet() const override { return !!m_setter; }
-
-	private:
-		Getter m_getter;
-		Setter m_setter;
-	};
-
-	QList<Object> m_objects;
-	QVector<QPair<QString, QMap<int, IEntry *>>> m_entries;
-
-	void addEntryInternal(IEntry *e, const int entry, const int role)
-	{
-		if (m_entries.size() <= entry)
-		{
-			m_entries.resize(entry + 1);
-		}
-		m_entries[entry].second.insert(role, e);
-	}
-
-protected:
-	template<typename Getter, typename Setter>
-	typename std::enable_if<std::is_member_function_pointer<Getter>::value && std::is_member_function_pointer<Getter>::value, void>::type
-	addEntry(Getter getter, Setter setter, const int entry, const int role)
-	{
-		addEntryInternal(new FunctionEntry<typename std::result_of<Getter>::type>(getter, setter), entry, role);
-	}
-	template<typename Getter>
-	typename std::enable_if<std::is_member_function_pointer<Getter>::value, void>::type
-	addEntry(Getter getter, const int entry, const int role)
-	{
-		addEntryInternal(new FunctionEntry<typename std::result_of<Getter>::type>(getter, nullptr), entry, role);
-	}
-	template<typename T>
-	typename std::enable_if<!std::is_member_function_pointer<T (Object::*)>::value, void>::type
-	addEntry(T (Object::*member), const int entry, const int role)
-	{
-		addEntryInternal(new VariableEntry<T>(member), entry, role);
-	}
-
-	void setEntryTitle(const int entry, const QString &title)
-	{
-		m_entries[entry].first = title;
-	}
-};
-template<typename Object>
-class AbstractCommonModel<Object *> : public BaseAbstractCommonModel
-{
-public:
-	explicit AbstractCommonModel(const Qt::Orientation orientation)
-		: BaseAbstractCommonModel(orientation) {}
-	virtual ~AbstractCommonModel()
-	{
-		qDeleteAll(m_objects);
-	}
-
-	int size() const override { return m_objects.size(); }
-	int entryCount() const override { return m_entries.size(); }
-
-	void append(Object *object)
-	{
-		notifyAboutToAddObject(size());
-		m_objects.append(object);
-		notifyObjectAdded();
-	}
-	void prepend(Object *object)
-	{
-		notifyAboutToAddObject(0);
-		m_objects.prepend(object);
-		notifyObjectAdded();
-	}
-	void insert(Object *object, const int index)
-	{
-		if (index >= size())
-		{
-			prepend(object);
-		}
-		else if (index <= 0)
-		{
-			append(object);
-		}
-		else
-		{
-			notifyAboutToAddObject(index);
-			m_objects.insert(index, object);
-			notifyObjectAdded();
-		}
-	}
-	void remove(const int index)
-	{
-		notifyAboutToRemoveObject(index);
-		m_objects.removeAt(index);
-		notifyObjectRemoved();
-	}
-	Object *get(const int index) const
-	{
-		return m_objects.at(index);
-	}
-	int find(Object * const obj) const
-	{
-		return m_objects.indexOf(obj);
-	}
-
-	QList<Object *> getAll() const
-	{
-		return m_objects;
-	}
-
-private:
-	friend class CommonModel;
-	QVariant get(const int index, const int entry, const int role) const override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(role))
-		{
-			return QVariant();
-		}
-		return m_entries[entry].second.value(role)->get(m_objects.at(index));
-	}
-	bool set(const int index, const int entry, const int role, const QVariant &value) override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(role))
-		{
-			return false;
-		}
-		IEntry *e = m_entries[entry].second.value(role);
-		if (!e->canSet())
-		{
-			return false;
-		}
-		e->set(m_objects[index], value);
-		return true;
-	}
-	bool canSet(const int entry) const override
-	{
-		if (m_entries.size() < entry || !m_entries[entry].second.contains(Qt::EditRole))
-		{
-			return false;
-		}
-		IEntry *e = m_entries[entry].second.value(Qt::EditRole);
-		return e->canSet();
-	}
-
-	QString entryTitle(const int entry) const override
-	{
-		return m_entries.at(entry).first;
-	}
-
-private:
-	struct IEntry
-	{
-		virtual ~IEntry() {}
-		virtual void set(Object *object, const QVariant &value) = 0;
-		virtual QVariant get(Object *object) const = 0;
-		virtual bool canSet() const = 0;
-	};
-	template<typename T>
-	struct VariableEntry : public IEntry
-	{
-		typedef T (Object::*Member);
-
-		explicit VariableEntry(Member member)
-			: m_member(member) {}
-
-		void set(Object *object, const QVariant &value) override
-		{
-			object->*m_member = value.value<T>();
-		}
-		QVariant get(Object *object) const override
-		{
-			return QVariant::fromValue<T>(object->*m_member);
-		}
-		bool canSet() const override { return true; }
-
-	private:
-		Member m_member;
-	};
-	template<typename T>
-	struct FunctionEntry : public IEntry
-	{
-		typedef T (Object::*Getter)() const;
-		typedef void (Object::*Setter)(T);
-
-		explicit FunctionEntry(Getter getter, Setter setter)
-			: m_getter(getter), m_setter(setter) {}
-
-		void set(Object *object, const QVariant &value) override
-		{
-			(object->*m_setter)(value.value<T>());
-		}
-		QVariant get(Object *object) const override
-		{
-			return QVariant::fromValue<T>((object->*m_getter)());
-		}
-		bool canSet() const override { return !!m_setter; }
-
-	private:
-		Getter m_getter;
-		Setter m_setter;
-	};
-	template<typename T>
-	struct LambdaEntry : public IEntry
-	{
-		using Getter = std::function<T(Object *)>;
-
-		explicit LambdaEntry(Getter getter)
-			: m_getter(getter) {}
-
-		void set(Object *object, const QVariant &value) override {}
-		QVariant get(Object *object) const override
-		{
-			return QVariant::fromValue<T>(m_getter(object));
-		}
-		bool canSet() const override { return false; }
-
-	private:
-		Getter m_getter;
-	};
-
-	QList<Object *> m_objects;
-	QVector<QPair<QString, QMap<int, IEntry *>>> m_entries;
-
-	void addEntryInternal(IEntry *e, const int entry, const int role)
-	{
-		if (m_entries.size() <= entry)
-		{
-			m_entries.resize(entry + 1);
-		}
-		m_entries[entry].second.insert(role, e);
-	}
-
-protected:
-	template<typename Getter, typename Setter>
-	typename std::enable_if<std::is_member_function_pointer<Getter>::value && std::is_member_function_pointer<Getter>::value, void>::type
-	addEntry(const int entry, const int role, Getter getter, Setter setter)
-	{
-		addEntryInternal(new FunctionEntry<typename std::result_of<Getter>::type>(getter, setter), entry, role);
-	}
-	template<typename T>
-	typename std::enable_if<std::is_member_function_pointer<typename FunctionEntry<T>::Getter>::value, void>::type
-	addEntry(const int entry, const int role, typename FunctionEntry<T>::Getter getter)
-	{
-		addEntryInternal(new FunctionEntry<T>(getter, nullptr), entry, role);
-	}
-	template<typename T>
-	typename std::enable_if<!std::is_member_function_pointer<T (Object::*)>::value, void>::type
-	addEntry(const int entry, const int role, T (Object::*member))
-	{
-		addEntryInternal(new VariableEntry<T>(member), entry, role);
-	}
-	template<typename T>
-	void addEntry(const int entry, const int role, typename LambdaEntry<T>::Getter lambda)
-	{
-		addEntryInternal(new LambdaEntry<T>(lambda), entry, role);
-	}
-
-	void setEntryTitle(const int entry, const QString &title)
-	{
-		m_entries[entry].first = title;
-	}
-
-	void setAll(const QList<Object *> objects)
-	{
-		notifyBeginReset();
-		qDeleteAll(m_objects);
-		m_objects = objects;
-		notifyEndReset();
-	}
-};
diff --git a/libraries/logic/BaseConfigObject.cpp b/libraries/logic/BaseConfigObject.cpp
deleted file mode 100644
index 3040ac2e..00000000
--- a/libraries/logic/BaseConfigObject.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseConfigObject.h"
-
-#include <QTimer>
-#include <QFile>
-#include <QCoreApplication>
-#include <QDebug>
-
-#include "Exception.h"
-#include "FileSystem.h"
-
-BaseConfigObject::BaseConfigObject(const QString &filename)
-	: m_filename(filename)
-{
-	m_saveTimer = new QTimer;
-	m_saveTimer->setSingleShot(true);
-	// cppcheck-suppress pureVirtualCall
-	QObject::connect(m_saveTimer, &QTimer::timeout, [this](){saveNow();});
-	setSaveTimeout(250);
-
-	m_initialReadTimer = new QTimer;
-	m_initialReadTimer->setSingleShot(true);
-	QObject::connect(m_initialReadTimer, &QTimer::timeout, [this]()
-	{
-		loadNow();
-		m_initialReadTimer->deleteLater();
-		m_initialReadTimer = 0;
-	});
-	m_initialReadTimer->start(0);
-
-	// cppcheck-suppress pureVirtualCall
-	m_appQuitConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [this](){saveNow();});
-}
-BaseConfigObject::~BaseConfigObject()
-{
-	delete m_saveTimer;
-	if (m_initialReadTimer)
-	{
-		delete m_initialReadTimer;
-	}
-	QObject::disconnect(m_appQuitConnection);
-}
-
-void BaseConfigObject::setSaveTimeout(int msec)
-{
-	m_saveTimer->setInterval(msec);
-}
-
-void BaseConfigObject::scheduleSave()
-{
-	m_saveTimer->stop();
-	m_saveTimer->start();
-}
-void BaseConfigObject::saveNow()
-{
-	if (m_saveTimer->isActive())
-	{
-		m_saveTimer->stop();
-	}
-	if (m_disableSaving)
-	{
-		return;
-	}
-
-	try
-	{
-		FS::write(m_filename, doSave());
-	}
-	catch (Exception & e)
-	{
-		qCritical() << e.cause();
-	}
-}
-void BaseConfigObject::loadNow()
-{
-	if (m_saveTimer->isActive())
-	{
-		saveNow();
-	}
-
-	try
-	{
-		doLoad(FS::read(m_filename));
-	}
-	catch (Exception & e)
-	{
-		qWarning() << "Error loading" << m_filename << ":" << e.cause();
-	}
-}
diff --git a/libraries/logic/BaseConfigObject.h b/libraries/logic/BaseConfigObject.h
deleted file mode 100644
index 1c96b3d1..00000000
--- a/libraries/logic/BaseConfigObject.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-
-class QTimer;
-
-class BaseConfigObject
-{
-public:
-	void setSaveTimeout(int msec);
-
-protected:
-	explicit BaseConfigObject(const QString &filename);
-	virtual ~BaseConfigObject();
-
-	// cppcheck-suppress pureVirtualCall
-	virtual QByteArray doSave() const = 0;
-	virtual void doLoad(const QByteArray &data) = 0;
-
-	void setSavingDisabled(bool savingDisabled) { m_disableSaving = savingDisabled; }
-
-	QString fileName() const { return m_filename; }
-
-public:
-	void scheduleSave();
-	void saveNow();
-	void loadNow();
-
-private:
-	QTimer *m_saveTimer;
-	QTimer *m_initialReadTimer;
-	QString m_filename;
-	QMetaObject::Connection m_appQuitConnection;
-	bool m_disableSaving = false;
-};
diff --git a/libraries/logic/BaseInstaller.cpp b/libraries/logic/BaseInstaller.cpp
deleted file mode 100644
index cb762ebd..00000000
--- a/libraries/logic/BaseInstaller.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QFile>
-
-#include "BaseInstaller.h"
-#include "minecraft/onesix/OneSixInstance.h"
-
-BaseInstaller::BaseInstaller()
-{
-
-}
-
-bool BaseInstaller::isApplied(OneSixInstance *on)
-{
-	return QFile::exists(filename(on->instanceRoot()));
-}
-
-bool BaseInstaller::add(OneSixInstance *to)
-{
-	if (!patchesDir(to->instanceRoot()).exists())
-	{
-		QDir(to->instanceRoot()).mkdir("patches");
-	}
-
-	if (isApplied(to))
-	{
-		if (!remove(to))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool BaseInstaller::remove(OneSixInstance *from)
-{
-	return QFile::remove(filename(from->instanceRoot()));
-}
-
-QString BaseInstaller::filename(const QString &root) const
-{
-	return patchesDir(root).absoluteFilePath(id() + ".json");
-}
-QDir BaseInstaller::patchesDir(const QString &root) const
-{
-	return QDir(root + "/patches/");
-}
diff --git a/libraries/logic/BaseInstaller.h b/libraries/logic/BaseInstaller.h
deleted file mode 100644
index a50c8cb1..00000000
--- a/libraries/logic/BaseInstaller.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class OneSixInstance;
-class QDir;
-class QString;
-class QObject;
-class Task;
-class BaseVersion;
-typedef std::shared_ptr<BaseVersion> BaseVersionPtr;
-
-class MULTIMC_LOGIC_EXPORT BaseInstaller
-{
-public:
-	BaseInstaller();
-	virtual ~BaseInstaller(){};
-	bool isApplied(OneSixInstance *on);
-
-	virtual bool add(OneSixInstance *to);
-	virtual bool remove(OneSixInstance *from);
-
-	virtual Task *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) = 0;
-
-protected:
-	virtual QString id() const = 0;
-	QString filename(const QString &root) const;
-	QDir patchesDir(const QString &root) const;
-};
diff --git a/libraries/logic/BaseInstance.cpp b/libraries/logic/BaseInstance.cpp
deleted file mode 100644
index ce55d5e4..00000000
--- a/libraries/logic/BaseInstance.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseInstance.h"
-
-#include <QFileInfo>
-#include <QDir>
-
-#include "settings/INISettingsObject.h"
-#include "settings/Setting.h"
-#include "settings/OverrideSetting.h"
-
-#include "minecraft/MinecraftVersionList.h"
-#include "FileSystem.h"
-#include "Commandline.h"
-
-BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: QObject()
-{
-	m_settings = settings;
-	m_rootDir = rootDir;
-
-	m_settings->registerSetting("name", "Unnamed Instance");
-	m_settings->registerSetting("iconKey", "default");
-	m_settings->registerSetting("notes", "");
-	m_settings->registerSetting("lastLaunchTime", 0);
-	m_settings->registerSetting("totalTimePlayed", 0);
-
-	// Custom Commands
-	auto commandSetting = m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false);
-	m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand"), commandSetting);
-	m_settings->registerOverride(globalSettings->getSetting("WrapperCommand"), commandSetting);
-	m_settings->registerOverride(globalSettings->getSetting("PostExitCommand"), commandSetting);
-
-	// Console
-	auto consoleSetting = m_settings->registerSetting("OverrideConsole", false);
-	m_settings->registerOverride(globalSettings->getSetting("ShowConsole"), consoleSetting);
-	m_settings->registerOverride(globalSettings->getSetting("AutoCloseConsole"), consoleSetting);
-	m_settings->registerOverride(globalSettings->getSetting("LogPrePostOutput"), consoleSetting);
-}
-
-QString BaseInstance::getPreLaunchCommand()
-{
-	return settings()->get("PreLaunchCommand").toString();
-}
-
-QString BaseInstance::getWrapperCommand()
-{
-	return settings()->get("WrapperCommand").toString();
-}
-
-QString BaseInstance::getPostExitCommand()
-{
-	return settings()->get("PostExitCommand").toString();
-}
-
-void BaseInstance::iconUpdated(QString key)
-{
-	if(iconKey() == key)
-	{
-		emit propertiesChanged(this);
-	}
-}
-
-void BaseInstance::nuke()
-{
-	FS::deletePath(instanceRoot());
-	emit nuked(this);
-}
-
-QString BaseInstance::id() const
-{
-	return QFileInfo(instanceRoot()).fileName();
-}
-
-bool BaseInstance::isRunning() const
-{
-	return m_isRunning;
-}
-
-void BaseInstance::setRunning(bool running)
-{
-	if(running && !m_isRunning)
-	{
-		m_timeStarted = QDateTime::currentDateTime();
-	}
-	else if(!running && m_isRunning)
-	{
-		qint64 current = settings()->get("totalTimePlayed").toLongLong();
-		QDateTime timeEnded = QDateTime::currentDateTime();
-		settings()->set("totalTimePlayed", current + m_timeStarted.secsTo(timeEnded));
-		emit propertiesChanged(this);
-	}
-	m_isRunning = running;
-}
-
-int64_t BaseInstance::totalTimePlayed() const
-{
-	qint64 current = settings()->get("totalTimePlayed").toLongLong();
-	if(m_isRunning)
-	{
-		QDateTime timeNow = QDateTime::currentDateTime();
-		return current + m_timeStarted.secsTo(timeNow);
-	}
-	return current;
-}
-
-void BaseInstance::resetTimePlayed()
-{
-	settings()->reset("totalTimePlayed");
-}
-
-QString BaseInstance::instanceType() const
-{
-	return m_settings->get("InstanceType").toString();
-}
-
-QString BaseInstance::instanceRoot() const
-{
-	return m_rootDir;
-}
-
-InstancePtr BaseInstance::getSharedPtr()
-{
-	return shared_from_this();
-}
-
-SettingsObjectPtr BaseInstance::settings() const
-{
-	return m_settings;
-}
-
-BaseInstance::InstanceFlags BaseInstance::flags() const
-{
-	return m_flags;
-}
-
-void BaseInstance::setFlags(const InstanceFlags &flags)
-{
-	if (flags != m_flags)
-	{
-		m_flags = flags;
-		emit flagsChanged();
-		emit propertiesChanged(this);
-	}
-}
-
-void BaseInstance::setFlag(const BaseInstance::InstanceFlag flag)
-{
-	// nothing to set?
-	if(flag & m_flags)
-		return;
-	m_flags |= flag;
-	emit flagsChanged();
-	emit propertiesChanged(this);
-}
-
-void BaseInstance::unsetFlag(const BaseInstance::InstanceFlag flag)
-{
-	// nothing to unset?
-	if(!(flag & m_flags))
-		return;
-	m_flags &= ~flag;
-	emit flagsChanged();
-	emit propertiesChanged(this);
-}
-
-bool BaseInstance::canLaunch() const
-{
-	return !(flags() & VersionBrokenFlag);
-}
-
-bool BaseInstance::reload()
-{
-	return m_settings->reload();
-}
-
-qint64 BaseInstance::lastLaunch() const
-{
-	return m_settings->get("lastLaunchTime").value<qint64>();
-}
-
-void BaseInstance::setLastLaunch(qint64 val)
-{
-	//FIXME: if no change, do not set. setting involves saving a file.
-	m_settings->set("lastLaunchTime", val);
-	emit propertiesChanged(this);
-}
-
-void BaseInstance::setGroupInitial(QString val)
-{
-	if(m_group == val)
-	{
-		return;
-	}
-	m_group = val;
-	emit propertiesChanged(this);
-}
-
-void BaseInstance::setGroupPost(QString val)
-{
-	if(m_group == val)
-	{
-		return;
-	}
-	setGroupInitial(val);
-	emit groupChanged();
-}
-
-QString BaseInstance::group() const
-{
-	return m_group;
-}
-
-void BaseInstance::setNotes(QString val)
-{
-	//FIXME: if no change, do not set. setting involves saving a file.
-	m_settings->set("notes", val);
-}
-
-QString BaseInstance::notes() const
-{
-	return m_settings->get("notes").toString();
-}
-
-void BaseInstance::setIconKey(QString val)
-{
-	//FIXME: if no change, do not set. setting involves saving a file.
-	m_settings->set("iconKey", val);
-	emit propertiesChanged(this);
-}
-
-QString BaseInstance::iconKey() const
-{
-	return m_settings->get("iconKey").toString();
-}
-
-void BaseInstance::setName(QString val)
-{
-	//FIXME: if no change, do not set. setting involves saving a file.
-	m_settings->set("name", val);
-	emit propertiesChanged(this);
-}
-
-QString BaseInstance::name() const
-{
-	return m_settings->get("name").toString();
-}
-
-QString BaseInstance::windowTitle() const
-{
-	return "MultiMC: " + name();
-}
-
-QStringList BaseInstance::extraArguments() const
-{
-	return Commandline::splitArgs(settings()->get("JvmArgs").toString());
-}
diff --git a/libraries/logic/BaseInstance.h b/libraries/logic/BaseInstance.h
deleted file mode 100644
index 5e587c48..00000000
--- a/libraries/logic/BaseInstance.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QDateTime>
-#include <QSet>
-#include <QProcess>
-
-#include "settings/SettingsObject.h"
-
-#include "settings/INIFile.h"
-#include "BaseVersionList.h"
-#include "minecraft/auth/MojangAccount.h"
-#include "launch/MessageLevel.h"
-#include "pathmatcher/IPathMatcher.h"
-
-#include "multimc_logic_export.h"
-
-class QDir;
-class Task;
-class LaunchTask;
-class BaseInstance;
-
-// pointer for lazy people
-typedef std::shared_ptr<BaseInstance> InstancePtr;
-
-/*!
- * \brief Base class for instances.
- * This class implements many functions that are common between instances and
- * provides a standard interface for all instances.
- *
- * To create a new instance type, create a new class inheriting from this class
- * and implement the pure virtual functions.
- */
-class MULTIMC_LOGIC_EXPORT BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance>
-{
-	Q_OBJECT
-protected:
-	/// no-touchy!
-	BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-
-public:
-	/// virtual destructor to make sure the destruction is COMPLETE
-	virtual ~BaseInstance() {};
-
-	virtual void copy(const QDir &newDir) {}
-
-	virtual void init() = 0;
-
-	/// nuke thoroughly - deletes the instance contents, notifies the list/model which is
-	/// responsible of cleaning up the husk
-	void nuke();
-
-	/// The instance's ID. The ID SHALL be determined by MMC internally. The ID IS guaranteed to
-	/// be unique.
-	virtual QString id() const;
-
-	void setRunning(bool running);
-	bool isRunning() const;
-	int64_t totalTimePlayed() const;
-	void resetTimePlayed();
-
-	/// get the type of this instance
-	QString instanceType() const;
-
-	/// Path to the instance's root directory.
-	QString instanceRoot() const;
-
-	QString name() const;
-	void setName(QString val);
-
-	/// Value used for instance window titles
-	QString windowTitle() const;
-
-	QString iconKey() const;
-	void setIconKey(QString val);
-
-	QString notes() const;
-	void setNotes(QString val);
-
-	QString group() const;
-	void setGroupInitial(QString val);
-	void setGroupPost(QString val);
-
-	QString getPreLaunchCommand();
-	QString getPostExitCommand();
-	QString getWrapperCommand();
-
-	/// guess log level from a line of game log
-	virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level)
-	{
-		return level;
-	};
-
-	virtual QStringList extraArguments() const;
-
-	virtual QString intendedVersionId() const = 0;
-	virtual bool setIntendedVersionId(QString version) = 0;
-
-	/*!
-	 * The instance's current version.
-	 * This value represents the instance's current version. If this value is
-	 * different from the intendedVersion, the instance should be updated.
-	 * \warning Don't change this value unless you know what you're doing.
-	 */
-	virtual QString currentVersionId() const = 0;
-
-	/*!
-	 * Whether or not 'the game' should be downloaded when the instance is launched.
-	 */
-	virtual bool shouldUpdate() const = 0;
-	virtual void setShouldUpdate(bool val) = 0;
-
-	/// Traits. Normally inside the version, depends on instance implementation.
-	virtual QSet <QString> traits() = 0;
-
-	/**
-	 * Gets the time that the instance was last launched.
-	 * Stored in milliseconds since epoch.
-	 */
-	qint64 lastLaunch() const;
-	/// Sets the last launched time to 'val' milliseconds since epoch
-	void setLastLaunch(qint64 val = QDateTime::currentMSecsSinceEpoch());
-
-	InstancePtr getSharedPtr();
-
-	/*!
-	 * \brief Gets a pointer to this instance's version list.
-	 * \return A pointer to the available version list for this instance.
-	 */
-	virtual std::shared_ptr<BaseVersionList> versionList() const = 0;
-
-	/*!
-	 * \brief Gets this instance's settings object.
-	 * This settings object stores instance-specific settings.
-	 * \return A pointer to this instance's settings object.
-	 */
-	virtual SettingsObjectPtr settings() const;
-
-	/// returns a valid update task
-	virtual std::shared_ptr<Task> createUpdateTask() = 0;
-
-	/// returns a valid launcher (task container)
-	virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) = 0;
-
-	/*!
-	 * Returns a task that should be done right before launch
-	 * This task should do any extra preparations needed
-	 */
-	virtual std::shared_ptr<Task> createJarModdingTask() = 0;
-
-	/*!
-	 * Create envrironment variables for running the instance
-	 */
-	virtual QProcessEnvironment createEnvironment() = 0;
-
-	/*!
-	 * Returns a matcher that can maps relative paths within the instance to whether they are 'log files'
-	 */
-	virtual IPathMatcher::Ptr getLogFileMatcher() = 0;
-
-	/*!
-	 * Returns the root folder to use for looking up log files
-	 */
-	virtual QString getLogFileRoot() = 0;
-
-	/*!
-	 * does any necessary cleanups after the instance finishes. also runs before\
-	 * TODO: turn into a task that can run asynchronously
-	 */
-	virtual void cleanupAfterRun() = 0;
-
-	virtual QString getStatusbarDescription() = 0;
-
-	/// FIXME: this really should be elsewhere...
-	virtual QString instanceConfigFolder() const = 0;
-
-	/// get variables this instance exports
-	virtual QMap<QString, QString> getVariables() const = 0;
-
-	virtual QString typeName() const = 0;
-
-	enum InstanceFlag
-	{
-		VersionBrokenFlag = 0x01,
-		UpdateAvailable = 0x02
-	};
-	Q_DECLARE_FLAGS(InstanceFlags, InstanceFlag)
-	InstanceFlags flags() const;
-	void setFlags(const InstanceFlags &flags);
-	void setFlag(const InstanceFlag flag);
-	void unsetFlag(const InstanceFlag flag);
-
-	bool canLaunch() const;
-	virtual bool canExport() const = 0;
-
-	virtual bool reload();
-
-signals:
-	/*!
-	 * \brief Signal emitted when properties relevant to the instance view change
-	 */
-	void propertiesChanged(BaseInstance *inst);
-	/*!
-	 * \brief Signal emitted when groups are affected in any way
-	 */
-	void groupChanged();
-	/*!
-	 * \brief The instance just got nuked. Hurray!
-	 */
-	void nuked(BaseInstance *inst);
-
-	void flagsChanged();
-
-protected slots:
-	void iconUpdated(QString key);
-
-protected:
-	QString m_rootDir;
-	QString m_group;
-	SettingsObjectPtr m_settings;
-	InstanceFlags m_flags;
-	bool m_isRunning = false;
-	QDateTime m_timeStarted;
-};
-
-Q_DECLARE_METATYPE(std::shared_ptr<BaseInstance>)
-Q_DECLARE_METATYPE(BaseInstance::InstanceFlag)
-Q_DECLARE_OPERATORS_FOR_FLAGS(BaseInstance::InstanceFlags)
diff --git a/libraries/logic/BaseVersion.h b/libraries/logic/BaseVersion.h
deleted file mode 100644
index 80767518..00000000
--- a/libraries/logic/BaseVersion.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <memory>
-#include <QString>
-#include <QMetaType>
-
-/*!
- * An abstract base class for versions.
- */
-class BaseVersion
-{
-public:
-	virtual ~BaseVersion() {}
-	/*!
-	 * A string used to identify this version in config files.
-	 * This should be unique within the version list or shenanigans will occur.
-	 */
-	virtual QString descriptor() = 0;
-
-	/*!
-	 * The name of this version as it is displayed to the user.
-	 * For example: "1.5.1"
-	 */
-	virtual QString name() = 0;
-
-	/*!
-	 * This should return a string that describes
-	 * the kind of version this is (Stable, Beta, Snapshot, whatever)
-	 */
-	virtual QString typeString() const = 0;
-
-	virtual bool operator<(BaseVersion &a)
-	{
-		return name() < a.name();
-	};
-	virtual bool operator>(BaseVersion &a)
-	{
-		return name() > a.name();
-	};
-};
-
-typedef std::shared_ptr<BaseVersion> BaseVersionPtr;
-
-Q_DECLARE_METATYPE(BaseVersionPtr)
diff --git a/libraries/logic/BaseVersionList.cpp b/libraries/logic/BaseVersionList.cpp
deleted file mode 100644
index b34f318c..00000000
--- a/libraries/logic/BaseVersionList.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseVersionList.h"
-#include "BaseVersion.h"
-
-BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
-{
-}
-
-BaseVersionPtr BaseVersionList::findVersion(const QString &descriptor)
-{
-	for (int i = 0; i < count(); i++)
-	{
-		if (at(i)->descriptor() == descriptor)
-			return at(i);
-	}
-	return BaseVersionPtr();
-}
-
-BaseVersionPtr BaseVersionList::getLatestStable() const
-{
-	if (count() <= 0)
-		return BaseVersionPtr();
-	else
-		return at(0);
-}
-
-BaseVersionPtr BaseVersionList::getRecommended() const
-{
-	return getLatestStable();
-}
-
-QVariant BaseVersionList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	BaseVersionPtr version = at(index.row());
-
-	switch (role)
-	{
-	case VersionPointerRole:
-		return qVariantFromValue(version);
-
-	case VersionRole:
-		return version->name();
-
-	case VersionIdRole:
-		return version->descriptor();
-
-	case TypeRole:
-		return version->typeString();
-
-	default:
-		return QVariant();
-	}
-}
-
-BaseVersionList::RoleList BaseVersionList::providesRoles() const
-{
-	return {VersionPointerRole, VersionRole, VersionIdRole, TypeRole};
-}
-
-int BaseVersionList::rowCount(const QModelIndex &parent) const
-{
-	// Return count
-	return count();
-}
-
-int BaseVersionList::columnCount(const QModelIndex &parent) const
-{
-	return 1;
-}
-
-QHash<int, QByteArray> BaseVersionList::roleNames() const
-{
-	QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
-	roles.insert(VersionRole, "version");
-	roles.insert(VersionIdRole, "versionId");
-	roles.insert(ParentGameVersionRole, "parentGameVersion");
-	roles.insert(RecommendedRole, "recommended");
-	roles.insert(LatestRole, "latest");
-	roles.insert(TypeRole, "type");
-	roles.insert(BranchRole, "branch");
-	roles.insert(PathRole, "path");
-	roles.insert(ArchitectureRole, "architecture");
-	return roles;
-}
diff --git a/libraries/logic/BaseVersionList.h b/libraries/logic/BaseVersionList.h
deleted file mode 100644
index 73d2ee1f..00000000
--- a/libraries/logic/BaseVersionList.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QVariant>
-#include <QAbstractListModel>
-
-#include "BaseVersion.h"
-#include "tasks/Task.h"
-#include "multimc_logic_export.h"
-
-/*!
- * \brief Class that each instance type's version list derives from.
- * Version lists are the lists that keep track of the available game versions
- * for that instance. This list will not be loaded on startup. It will be loaded
- * when the list's load function is called. Before using the version list, you
- * should check to see if it has been loaded yet and if not, load the list.
- *
- * Note that this class also inherits from QAbstractListModel. Methods from that
- * class determine how this version list shows up in a list view. Said methods
- * all have a default implementation, but they can be overridden by plugins to
- * change the behavior of the list.
- */
-class MULTIMC_LOGIC_EXPORT BaseVersionList : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	enum ModelRoles
-	{
-		VersionPointerRole = Qt::UserRole,
-		VersionRole,
-		VersionIdRole,
-		ParentGameVersionRole,
-		RecommendedRole,
-		LatestRole,
-		TypeRole,
-		BranchRole,
-		PathRole,
-		ArchitectureRole,
-		SortRole
-	};
-	typedef QList<int> RoleList;
-
-	explicit BaseVersionList(QObject *parent = 0);
-
-	/*!
-	 * \brief Gets a task that will reload the version list.
-	 * Simply execute the task to load the list.
-	 * The task returned by this function should reset the model when it's done.
-	 * \return A pointer to a task that reloads the version list.
-	 */
-	virtual Task *getLoadTask() = 0;
-
-	//! Checks whether or not the list is loaded. If this returns false, the list should be
-	//loaded.
-	virtual bool isLoaded() = 0;
-
-	//! Gets the version at the given index.
-	virtual const BaseVersionPtr at(int i) const = 0;
-
-	//! Returns the number of versions in the list.
-	virtual int count() const = 0;
-
-	//////// List Model Functions ////////
-	virtual QVariant data(const QModelIndex &index, int role) const;
-	virtual int rowCount(const QModelIndex &parent) const;
-	virtual int columnCount(const QModelIndex &parent) const;
-	virtual QHash<int, QByteArray> roleNames() const override;
-
-	//! which roles are provided by this version list?
-	virtual RoleList providesRoles() const;
-
-	/*!
-	 * \brief Finds a version by its descriptor.
-	 * \param The descriptor of the version to find.
-	 * \return A const pointer to the version with the given descriptor. NULL if
-	 * one doesn't exist.
-	 */
-	virtual BaseVersionPtr findVersion(const QString &descriptor);
-
-	/*!
-	 * \brief Gets the latest stable version from this list
-	 */
-	virtual BaseVersionPtr getLatestStable() const;
-
-	/*!
-	 * \brief Gets the recommended version from this list
-	 * If the list doesn't support recommended versions, this works exactly as getLatestStable
-	 */
-	virtual BaseVersionPtr getRecommended() const;
-
-	/*!
-	 * Sorts the version list.
-	 */
-	virtual void sortVersions() = 0;
-
-protected
-slots:
-	/*!
-	 * Updates this list with the given list of versions.
-	 * This is done by copying each version in the given list and inserting it
-	 * into this one.
-	 * We need to do this so that we can set the parents of the versions are set to this
-	 * version list. This can't be done in the load task, because the versions the load
-	 * task creates are on the load task's thread and Qt won't allow their parents
-	 * to be set to something created on another thread.
-	 * To get around that problem, we invoke this method on the GUI thread, which
-	 * then copies the versions and sets their parents correctly.
-	 * \param versions List of versions whose parents should be set.
-	 */
-	virtual void updateListData(QList<BaseVersionPtr> versions) = 0;
-};
diff --git a/libraries/logic/CMakeLists.txt b/libraries/logic/CMakeLists.txt
deleted file mode 100644
index 317627d5..00000000
--- a/libraries/logic/CMakeLists.txt
+++ /dev/null
@@ -1,344 +0,0 @@
-project(MultiMC_logic)
-
-set(LOGIC_SOURCES
-	# LOGIC - Base classes and infrastructure
-	BaseInstaller.h
-	BaseInstaller.cpp
-	BaseVersionList.h
-	BaseVersionList.cpp
-	InstanceList.h
-	InstanceList.cpp
-	BaseVersion.h
-	BaseInstance.h
-	BaseInstance.cpp
-	NullInstance.h
-	MMCZip.h
-	MMCZip.cpp
-	MMCStrings.h
-	MMCStrings.cpp
-	BaseConfigObject.h
-	BaseConfigObject.cpp
-	AbstractCommonModel.h
-	AbstractCommonModel.cpp
-	TypeMagic.h
-
-	# Prefix tree where node names are strings between separators
-	SeparatorPrefixTree.h
-
-	# WARNING: globals live here
-	Env.h
-	Env.cpp
-
-	# JSON parsing helpers
-	Json.h
-	Json.cpp
-
-	FileSystem.h
-	FileSystem.cpp
-
-	Exception.h
-
-	# RW lock protected map
-	RWStorage.h
-
-	# A variable that has an implicit default value and keeps track of changes
-	DefaultVariable.h
-
-	# a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
-	QObjectPtr.h
-
-	# Resources
-	resources/Resource.cpp
-	resources/Resource.h
-	resources/ResourceHandler.cpp
-	resources/ResourceHandler.h
-	resources/ResourceObserver.cpp
-	resources/ResourceObserver.h
-	resources/ResourceProxyModel.h
-	resources/ResourceProxyModel.cpp
-
-	# Path matchers
-	pathmatcher/FSTreeMatcher.h
-	pathmatcher/IPathMatcher.h
-	pathmatcher/MultiMatcher.h
-	pathmatcher/RegexpMatcher.h
-
-	# Compression support
-	GZip.h
-	GZip.cpp
-
-	# Command line parameter parsing
-	Commandline.h
-	Commandline.cpp
-
-	# Version number string support
-	Version.h
-	Version.cpp
-
-	# network stuffs
-	net/NetAction.h
-	net/MD5EtagDownload.h
-	net/MD5EtagDownload.cpp
-	net/ByteArrayDownload.h
-	net/ByteArrayDownload.cpp
-	net/CacheDownload.h
-	net/CacheDownload.cpp
-	net/NetJob.h
-	net/NetJob.cpp
-	net/HttpMetaCache.h
-	net/HttpMetaCache.cpp
-	net/PasteUpload.h
-	net/PasteUpload.cpp
-	net/URLConstants.h
-	net/URLConstants.cpp
-
-	# Yggdrasil login stuff
-	minecraft/auth/AuthSession.h
-	minecraft/auth/AuthSession.cpp
-	minecraft/auth/MojangAccountList.h
-	minecraft/auth/MojangAccountList.cpp
-	minecraft/auth/MojangAccount.h
-	minecraft/auth/MojangAccount.cpp
-	minecraft/auth/YggdrasilTask.h
-	minecraft/auth/YggdrasilTask.cpp
-	minecraft/auth/flows/AuthenticateTask.h
-	minecraft/auth/flows/AuthenticateTask.cpp
-	minecraft/auth/flows/RefreshTask.cpp
-	minecraft/auth/flows/RefreshTask.cpp
-	minecraft/auth/flows/ValidateTask.h
-	minecraft/auth/flows/ValidateTask.cpp
-
-	# Game launch logic
-	launch/steps/CheckJava.cpp
-	launch/steps/CheckJava.h
-	launch/steps/LaunchMinecraft.cpp
-	launch/steps/LaunchMinecraft.h
-	launch/steps/ModMinecraftJar.cpp
-	launch/steps/ModMinecraftJar.h
-	launch/steps/PostLaunchCommand.cpp
-	launch/steps/PostLaunchCommand.h
-	launch/steps/PreLaunchCommand.cpp
-	launch/steps/PreLaunchCommand.h
-	launch/steps/TextPrint.cpp
-	launch/steps/TextPrint.h
-	launch/steps/Update.cpp
-	launch/steps/Update.h
-	launch/LaunchStep.cpp
-	launch/LaunchStep.h
-	launch/LaunchTask.cpp
-	launch/LaunchTask.h
-	launch/LoggedProcess.cpp
-	launch/LoggedProcess.h
-	launch/MessageLevel.cpp
-	launch/MessageLevel.h
-
-	# Update system
-	updater/GoUpdate.h
-	updater/GoUpdate.cpp
-	updater/UpdateChecker.h
-	updater/UpdateChecker.cpp
-	updater/DownloadTask.h
-	updater/DownloadTask.cpp
-
-	# Notifications - short warning messages
-	notifications/NotificationChecker.h
-	notifications/NotificationChecker.cpp
-
-	# News System
-	news/NewsChecker.h
-	news/NewsChecker.cpp
-	news/NewsEntry.h
-	news/NewsEntry.cpp
-
-	# Status system
-	status/StatusChecker.h
-	status/StatusChecker.cpp
-
-	# Minecraft support
-	minecraft/onesix/OneSixUpdate.h
-	minecraft/onesix/OneSixUpdate.cpp
-	minecraft/onesix/OneSixInstance.h
-	minecraft/onesix/OneSixInstance.cpp
-	minecraft/onesix/OneSixProfileStrategy.cpp
-	minecraft/onesix/OneSixProfileStrategy.h
-	minecraft/onesix/OneSixVersionFormat.cpp
-	minecraft/onesix/OneSixVersionFormat.h
-	minecraft/legacy/LegacyUpdate.h
-	minecraft/legacy/LegacyUpdate.cpp
-	minecraft/legacy/LegacyInstance.h
-	minecraft/legacy/LegacyInstance.cpp
-	minecraft/legacy/LwjglVersionList.h
-	minecraft/legacy/LwjglVersionList.cpp
-	minecraft/GradleSpecifier.h
-	minecraft/MinecraftProfile.cpp
-	minecraft/MinecraftProfile.h
-	minecraft/MojangVersionFormat.cpp
-	minecraft/MojangVersionFormat.h
-	minecraft/JarMod.h
-	minecraft/MinecraftInstance.cpp
-	minecraft/MinecraftInstance.h
-	minecraft/MinecraftVersion.cpp
-	minecraft/MinecraftVersion.h
-	minecraft/MinecraftVersionList.cpp
-	minecraft/MinecraftVersionList.h
-	minecraft/Rule.cpp
-	minecraft/Rule.h
-	minecraft/OpSys.cpp
-	minecraft/OpSys.h
-	minecraft/ParseUtils.cpp
-	minecraft/ParseUtils.h
-	minecraft/ProfileUtils.cpp
-	minecraft/ProfileUtils.h
-	minecraft/ProfileStrategy.h
-	minecraft/Library.cpp
-	minecraft/Library.h
-	minecraft/MojangDownloadInfo.h
-	minecraft/VersionBuildError.h
-	minecraft/VersionFile.cpp
-	minecraft/VersionFile.h
-	minecraft/ProfilePatch.h
-	minecraft/VersionFilterData.h
-	minecraft/VersionFilterData.cpp
-	minecraft/Mod.h
-	minecraft/Mod.cpp
-	minecraft/ModList.h
-	minecraft/ModList.cpp
-	minecraft/World.h
-	minecraft/World.cpp
-	minecraft/WorldList.h
-	minecraft/WorldList.cpp
-
-	# FTB
-	minecraft/ftb/OneSixFTBInstance.h
-	minecraft/ftb/OneSixFTBInstance.cpp
-	minecraft/ftb/LegacyFTBInstance.h
-	minecraft/ftb/LegacyFTBInstance.cpp
-	minecraft/ftb/FTBProfileStrategy.h
-	minecraft/ftb/FTBProfileStrategy.cpp
-	minecraft/ftb/FTBPlugin.h
-	minecraft/ftb/FTBPlugin.cpp
-
-	# A Recursive file system watcher
-	RecursiveFileSystemWatcher.h
-	RecursiveFileSystemWatcher.cpp
-
-	# the screenshots feature
-	screenshots/Screenshot.h
-	screenshots/ImgurUpload.h
-	screenshots/ImgurUpload.cpp
-	screenshots/ImgurAlbumCreation.h
-	screenshots/ImgurAlbumCreation.cpp
-
-	# Tasks
-	tasks/Task.h
-	tasks/Task.cpp
-	tasks/ThreadTask.h
-	tasks/ThreadTask.cpp
-	tasks/SequentialTask.h
-	tasks/SequentialTask.cpp
-
-	# Settings
-	settings/INIFile.cpp
-	settings/INIFile.h
-	settings/INISettingsObject.cpp
-	settings/INISettingsObject.h
-	settings/OverrideSetting.cpp
-	settings/OverrideSetting.h
-	settings/PassthroughSetting.cpp
-	settings/PassthroughSetting.h
-	settings/Setting.cpp
-	settings/Setting.h
-	settings/SettingsObject.cpp
-	settings/SettingsObject.h
-
-	# Java related code
-	java/JavaChecker.h
-	java/JavaChecker.cpp
-	java/JavaCheckerJob.h
-	java/JavaCheckerJob.cpp
-	java/JavaInstall.h
-	java/JavaInstall.cpp
-	java/JavaInstallList.h
-	java/JavaInstallList.cpp
-	java/JavaUtils.h
-	java/JavaUtils.cpp
-	java/JavaVersion.h
-	java/JavaVersion.cpp
-
-	# Assets
-	minecraft/AssetsUtils.h
-	minecraft/AssetsUtils.cpp
-
-	# Forge and all things forge related
-	minecraft/forge/ForgeVersion.h
-	minecraft/forge/ForgeVersion.cpp
-	minecraft/forge/ForgeVersionList.h
-	minecraft/forge/ForgeVersionList.cpp
-	minecraft/forge/ForgeXzDownload.h
-	minecraft/forge/ForgeXzDownload.cpp
-	minecraft/forge/LegacyForge.h
-	minecraft/forge/LegacyForge.cpp
-	minecraft/forge/ForgeInstaller.h
-	minecraft/forge/ForgeInstaller.cpp
-
-	# Liteloader and related things
-	minecraft/liteloader/LiteLoaderInstaller.h
-	minecraft/liteloader/LiteLoaderInstaller.cpp
-	minecraft/liteloader/LiteLoaderVersionList.h
-	minecraft/liteloader/LiteLoaderVersionList.cpp
-
-	# Translations
-	trans/TranslationDownloader.h
-	trans/TranslationDownloader.cpp
-
-	# Tools
-	tools/BaseExternalTool.cpp
-	tools/BaseExternalTool.h
-	tools/BaseProfiler.cpp
-	tools/BaseProfiler.h
-	tools/JProfiler.cpp
-	tools/JProfiler.h
-	tools/JVisualVM.cpp
-	tools/JVisualVM.h
-	tools/MCEditTool.cpp
-	tools/MCEditTool.h
-
-	# Wonko
-	wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
-	wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
-	wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
-	wonko/tasks/BaseWonkoEntityLocalLoadTask.h
-	wonko/format/WonkoFormatV1.cpp
-	wonko/format/WonkoFormatV1.h
-	wonko/format/WonkoFormat.cpp
-	wonko/format/WonkoFormat.h
-	wonko/BaseWonkoEntity.cpp
-	wonko/BaseWonkoEntity.h
-	wonko/WonkoVersionList.cpp
-	wonko/WonkoVersionList.h
-	wonko/WonkoVersion.cpp
-	wonko/WonkoVersion.h
-	wonko/WonkoIndex.cpp
-	wonko/WonkoIndex.h
-	wonko/WonkoUtil.cpp
-	wonko/WonkoUtil.h
-	wonko/WonkoReference.cpp
-	wonko/WonkoReference.h
-)
-################################ COMPILE ################################
-
-# we need zlib
-find_package(ZLIB REQUIRED)
-
-add_library(MultiMC_logic SHARED ${LOGIC_SOURCES})
-set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
-
-generate_export_header(MultiMC_logic)
-
-# Link
-target_link_libraries(MultiMC_logic xz-embedded unpack200 ${QUAZIP_LIBRARIES} nbt++ ${ZLIB_LIBRARIES})
-qt5_use_modules(MultiMC_logic Core Xml Network Concurrent)
-add_dependencies(MultiMC_logic QuaZIP)
-
-# Mark and export headers
-target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}")
diff --git a/libraries/logic/Commandline.cpp b/libraries/logic/Commandline.cpp
deleted file mode 100644
index 9a8ddbf1..00000000
--- a/libraries/logic/Commandline.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Commandline.h"
-
-/**
- * @file libutil/src/cmdutils.cpp
- */
-
-namespace Commandline
-{
-
-// commandline splitter
-QStringList splitArgs(QString args)
-{
-	QStringList argv;
-	QString current;
-	bool escape = false;
-	QChar inquotes;
-	for (int i = 0; i < args.length(); i++)
-	{
-		QChar cchar = args.at(i);
-
-		// \ escaped
-		if (escape)
-		{
-			current += cchar;
-			escape = false;
-			// in "quotes"
-		}
-		else if (!inquotes.isNull())
-		{
-			if (cchar == 0x5C)
-				escape = true;
-			else if (cchar == inquotes)
-				inquotes = 0;
-			else
-				current += cchar;
-			// otherwise
-		}
-		else
-		{
-			if (cchar == 0x20)
-			{
-				if (!current.isEmpty())
-				{
-					argv << current;
-					current.clear();
-				}
-			}
-			else if (cchar == 0x22 || cchar == 0x27)
-				inquotes = cchar;
-			else
-				current += cchar;
-		}
-	}
-	if (!current.isEmpty())
-		argv << current;
-	return argv;
-}
-
-Parser::Parser(FlagStyle::Enum flagStyle, ArgumentStyle::Enum argStyle)
-{
-	m_flagStyle = flagStyle;
-	m_argStyle = argStyle;
-}
-
-// styles setter/getter
-void Parser::setArgumentStyle(ArgumentStyle::Enum style)
-{
-	m_argStyle = style;
-}
-ArgumentStyle::Enum Parser::argumentStyle()
-{
-	return m_argStyle;
-}
-
-void Parser::setFlagStyle(FlagStyle::Enum style)
-{
-	m_flagStyle = style;
-}
-FlagStyle::Enum Parser::flagStyle()
-{
-	return m_flagStyle;
-}
-
-// setup methods
-void Parser::addSwitch(QString name, bool def)
-{
-	if (m_params.contains(name))
-		throw "Name not unique";
-
-	OptionDef *param = new OptionDef;
-	param->type = otSwitch;
-	param->name = name;
-	param->metavar = QString("<%1>").arg(name);
-	param->def = def;
-
-	m_options[name] = param;
-	m_params[name] = (CommonDef *)param;
-	m_optionList.append(param);
-}
-
-void Parser::addOption(QString name, QVariant def)
-{
-	if (m_params.contains(name))
-		throw "Name not unique";
-
-	OptionDef *param = new OptionDef;
-	param->type = otOption;
-	param->name = name;
-	param->metavar = QString("<%1>").arg(name);
-	param->def = def;
-
-	m_options[name] = param;
-	m_params[name] = (CommonDef *)param;
-	m_optionList.append(param);
-}
-
-void Parser::addArgument(QString name, bool required, QVariant def)
-{
-	if (m_params.contains(name))
-		throw "Name not unique";
-
-	PositionalDef *param = new PositionalDef;
-	param->name = name;
-	param->def = def;
-	param->required = required;
-	param->metavar = name;
-
-	m_positionals.append(param);
-	m_params[name] = (CommonDef *)param;
-}
-
-void Parser::addDocumentation(QString name, QString doc, QString metavar)
-{
-	if (!m_params.contains(name))
-		throw "Name does not exist";
-
-	CommonDef *param = m_params[name];
-	param->doc = doc;
-	if (!metavar.isNull())
-		param->metavar = metavar;
-}
-
-void Parser::addShortOpt(QString name, QChar flag)
-{
-	if (!m_params.contains(name))
-		throw "Name does not exist";
-	if (!m_options.contains(name))
-		throw "Name is not an Option or Swtich";
-
-	OptionDef *param = m_options[name];
-	m_flags[flag] = param;
-	param->flag = flag;
-}
-
-// help methods
-QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
-{
-	QStringList help;
-	help << compileUsage(progName, useFlags) << "\r\n";
-
-	// positionals
-	if (!m_positionals.isEmpty())
-	{
-		help << "\r\n";
-		help << "Positional arguments:\r\n";
-		QListIterator<PositionalDef *> it2(m_positionals);
-		while (it2.hasNext())
-		{
-			PositionalDef *param = it2.next();
-			help << "  " << param->metavar;
-			help << " " << QString(helpIndent - param->metavar.length() - 1, ' ');
-			help << param->doc << "\r\n";
-		}
-	}
-
-	// Options
-	if (!m_optionList.isEmpty())
-	{
-		help << "\r\n";
-		QString optPrefix, flagPrefix;
-		getPrefix(optPrefix, flagPrefix);
-
-		help << "Options & Switches:\r\n";
-		QListIterator<OptionDef *> it(m_optionList);
-		while (it.hasNext())
-		{
-			OptionDef *option = it.next();
-			help << "  ";
-			int nameLength = optPrefix.length() + option->name.length();
-			if (!option->flag.isNull())
-			{
-				nameLength += 3 + flagPrefix.length();
-				help << flagPrefix << option->flag << ", ";
-			}
-			help << optPrefix << option->name;
-			if (option->type == otOption)
-			{
-				QString arg = QString("%1%2").arg(
-					((m_argStyle == ArgumentStyle::Equals) ? "=" : " "), option->metavar);
-				nameLength += arg.length();
-				help << arg;
-			}
-			help << " " << QString(helpIndent - nameLength - 1, ' ');
-			help << option->doc << "\r\n";
-		}
-	}
-
-	return help.join("");
-}
-
-QString Parser::compileUsage(QString progName, bool useFlags)
-{
-	QStringList usage;
-	usage << "Usage: " << progName;
-
-	QString optPrefix, flagPrefix;
-	getPrefix(optPrefix, flagPrefix);
-
-	// options
-	QListIterator<OptionDef *> it(m_optionList);
-	while (it.hasNext())
-	{
-		OptionDef *option = it.next();
-		usage << " [";
-		if (!option->flag.isNull() && useFlags)
-			usage << flagPrefix << option->flag;
-		else
-			usage << optPrefix << option->name;
-		if (option->type == otOption)
-			usage << ((m_argStyle == ArgumentStyle::Equals) ? "=" : " ") << option->metavar;
-		usage << "]";
-	}
-
-	// arguments
-	QListIterator<PositionalDef *> it2(m_positionals);
-	while (it2.hasNext())
-	{
-		PositionalDef *param = it2.next();
-		usage << " " << (param->required ? "<" : "[");
-		usage << param->metavar;
-		usage << (param->required ? ">" : "]");
-	}
-
-	return usage.join("");
-}
-
-// parsing
-QHash<QString, QVariant> Parser::parse(QStringList argv)
-{
-	QHash<QString, QVariant> map;
-
-	QStringListIterator it(argv);
-	QString programName = it.next();
-
-	QString optionPrefix;
-	QString flagPrefix;
-	QListIterator<PositionalDef *> positionals(m_positionals);
-	QStringList expecting;
-
-	getPrefix(optionPrefix, flagPrefix);
-
-	while (it.hasNext())
-	{
-		QString arg = it.next();
-
-		if (!expecting.isEmpty())
-		// we were expecting an argument
-		{
-			QString name = expecting.first();
-/*
-			if (map.contains(name))
-				throw ParsingError(
-					QString("Option %2%1 was given multiple times").arg(name, optionPrefix));
-*/
-			map[name] = QVariant(arg);
-
-			expecting.removeFirst();
-			continue;
-		}
-
-		if (arg.startsWith(optionPrefix))
-		// we have an option
-		{
-			// qDebug("Found option %s", qPrintable(arg));
-
-			QString name = arg.mid(optionPrefix.length());
-			QString equals;
-
-			if ((m_argStyle == ArgumentStyle::Equals ||
-				 m_argStyle == ArgumentStyle::SpaceAndEquals) &&
-				name.contains("="))
-			{
-				int i = name.indexOf("=");
-				equals = name.mid(i + 1);
-				name = name.left(i);
-			}
-
-			if (m_options.contains(name))
-			{
-				/*
-				if (map.contains(name))
-					throw ParsingError(QString("Option %2%1 was given multiple times")
-										   .arg(name, optionPrefix));
-*/
-				OptionDef *option = m_options[name];
-				if (option->type == otSwitch)
-					map[name] = true;
-				else // if (option->type == otOption)
-				{
-					if (m_argStyle == ArgumentStyle::Space)
-						expecting.append(name);
-					else if (!equals.isNull())
-						map[name] = equals;
-					else if (m_argStyle == ArgumentStyle::SpaceAndEquals)
-						expecting.append(name);
-					else
-						throw ParsingError(QString("Option %2%1 reqires an argument.")
-											   .arg(name, optionPrefix));
-				}
-
-				continue;
-			}
-
-			throw ParsingError(QString("Unknown Option %2%1").arg(name, optionPrefix));
-		}
-
-		if (arg.startsWith(flagPrefix))
-		// we have (a) flag(s)
-		{
-			// qDebug("Found flags %s", qPrintable(arg));
-
-			QString flags = arg.mid(flagPrefix.length());
-			QString equals;
-
-			if ((m_argStyle == ArgumentStyle::Equals ||
-				 m_argStyle == ArgumentStyle::SpaceAndEquals) &&
-				flags.contains("="))
-			{
-				int i = flags.indexOf("=");
-				equals = flags.mid(i + 1);
-				flags = flags.left(i);
-			}
-
-			for (int i = 0; i < flags.length(); i++)
-			{
-				QChar flag = flags.at(i);
-
-				if (!m_flags.contains(flag))
-					throw ParsingError(QString("Unknown flag %2%1").arg(flag, flagPrefix));
-
-				OptionDef *option = m_flags[flag];
-/*
-				if (map.contains(option->name))
-					throw ParsingError(QString("Option %2%1 was given multiple times")
-										   .arg(option->name, optionPrefix));
-*/
-				if (option->type == otSwitch)
-					map[option->name] = true;
-				else // if (option->type == otOption)
-				{
-					if (m_argStyle == ArgumentStyle::Space)
-						expecting.append(option->name);
-					else if (!equals.isNull())
-						if (i == flags.length() - 1)
-							map[option->name] = equals;
-						else
-							throw ParsingError(QString("Flag %4%2 of Argument-requiring Option "
-													   "%1 not last flag in %4%3")
-												   .arg(option->name, flag, flags, flagPrefix));
-					else if (m_argStyle == ArgumentStyle::SpaceAndEquals)
-						expecting.append(option->name);
-					else
-						throw ParsingError(QString("Option %1 reqires an argument. (flag %3%2)")
-											   .arg(option->name, flag, flagPrefix));
-				}
-			}
-
-			continue;
-		}
-
-		// must be a positional argument
-		if (!positionals.hasNext())
-			throw ParsingError(QString("Don't know what to do with '%1'").arg(arg));
-
-		PositionalDef *param = positionals.next();
-
-		map[param->name] = arg;
-	}
-
-	// check if we're missing something
-	if (!expecting.isEmpty())
-		throw ParsingError(QString("Was still expecting arguments for %2%1").arg(
-			expecting.join(QString(", ") + optionPrefix), optionPrefix));
-
-	while (positionals.hasNext())
-	{
-		PositionalDef *param = positionals.next();
-		if (param->required)
-			throw ParsingError(
-				QString("Missing required positional argument '%1'").arg(param->name));
-		else
-			map[param->name] = param->def;
-	}
-
-	// fill out gaps
-	QListIterator<OptionDef *> iter(m_optionList);
-	while (iter.hasNext())
-	{
-		OptionDef *option = iter.next();
-		if (!map.contains(option->name))
-			map[option->name] = option->def;
-	}
-
-	return map;
-}
-
-// clear defs
-void Parser::clear()
-{
-	m_flags.clear();
-	m_params.clear();
-	m_options.clear();
-
-	QMutableListIterator<OptionDef *> it(m_optionList);
-	while (it.hasNext())
-	{
-		OptionDef *option = it.next();
-		it.remove();
-		delete option;
-	}
-
-	QMutableListIterator<PositionalDef *> it2(m_positionals);
-	while (it2.hasNext())
-	{
-		PositionalDef *arg = it2.next();
-		it2.remove();
-		delete arg;
-	}
-}
-
-// Destructor
-Parser::~Parser()
-{
-	clear();
-}
-
-// getPrefix
-void Parser::getPrefix(QString &opt, QString &flag)
-{
-	if (m_flagStyle == FlagStyle::Windows)
-		opt = flag = "/";
-	else if (m_flagStyle == FlagStyle::Unix)
-		opt = flag = "-";
-	// else if (m_flagStyle == FlagStyle::GNU)
-	else
-	{
-		opt = "--";
-		flag = "-";
-	}
-}
-
-// ParsingError
-ParsingError::ParsingError(const QString &what) : std::runtime_error(what.toStdString())
-{
-}
-}
\ No newline at end of file
diff --git a/libraries/logic/Commandline.h b/libraries/logic/Commandline.h
deleted file mode 100644
index bee02bad..00000000
--- a/libraries/logic/Commandline.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <exception>
-#include <stdexcept>
-
-#include <QString>
-#include <QVariant>
-#include <QHash>
-#include <QStringList>
-
-#include "multimc_logic_export.h"
-
-/**
- * @file libutil/include/cmdutils.h
- * @brief commandline parsing and processing utilities
- */
-
-namespace Commandline
-{
-
-/**
- * @brief split a string into argv items like a shell would do
- * @param args the argument string
- * @return a QStringList containing all arguments
- */
-MULTIMC_LOGIC_EXPORT QStringList splitArgs(QString args);
-
-/**
- * @brief The FlagStyle enum
- * Specifies how flags are decorated
- */
-
-namespace FlagStyle
-{
-enum Enum
-{
-	GNU,	 /**< --option and -o (GNU Style) */
-	Unix,	/**< -option and -o  (Unix Style) */
-	Windows, /**< /option and /o  (Windows Style) */
-#ifdef Q_OS_WIN32
-	Default = Windows
-#else
-		Default = GNU
-#endif
-};
-}
-
-/**
- * @brief The ArgumentStyle enum
- */
-namespace ArgumentStyle
-{
-enum Enum
-{
-	Space,		  /**< --option=value */
-	Equals,		 /**< --option value */
-	SpaceAndEquals, /**< --option[= ]value */
-#ifdef Q_OS_WIN32
-	Default = Equals
-#else
-		Default = SpaceAndEquals
-#endif
-};
-}
-
-/**
- * @brief The ParsingError class
- */
-class MULTIMC_LOGIC_EXPORT ParsingError : public std::runtime_error
-{
-public:
-	ParsingError(const QString &what);
-};
-
-/**
- * @brief The Parser class
- */
-class MULTIMC_LOGIC_EXPORT Parser
-{
-public:
-	/**
-	 * @brief Parser constructor
-	 * @param flagStyle the FlagStyle to use in this Parser
-	 * @param argStyle the ArgumentStyle to use in this Parser
-	 */
-	Parser(FlagStyle::Enum flagStyle = FlagStyle::Default,
-		   ArgumentStyle::Enum argStyle = ArgumentStyle::Default);
-
-	/**
-	 * @brief set the flag style
-	 * @param style
-	 */
-	void setFlagStyle(FlagStyle::Enum style);
-
-	/**
-	 * @brief get the flag style
-	 * @return
-	 */
-	FlagStyle::Enum flagStyle();
-
-	/**
-	 * @brief set the argument style
-	 * @param style
-	 */
-	void setArgumentStyle(ArgumentStyle::Enum style);
-
-	/**
-	 * @brief get the argument style
-	 * @return
-	 */
-	ArgumentStyle::Enum argumentStyle();
-
-	/**
-	 * @brief define a boolean switch
-	 * @param name the parameter name
-	 * @param def the default value
-	 */
-	void addSwitch(QString name, bool def = false);
-
-	/**
-	 * @brief define an option that takes an additional argument
-	 * @param name the parameter name
-	 * @param def the default value
-	 */
-	void addOption(QString name, QVariant def = QVariant());
-
-	/**
-	 * @brief define a positional argument
-	 * @param name the parameter name
-	 * @param required wether this argument is required
-	 * @param def the default value
-	 */
-	void addArgument(QString name, bool required = true, QVariant def = QVariant());
-
-	/**
-	 * @brief adds a flag to an existing parameter
-	 * @param name the (existing) parameter name
-	 * @param flag the flag character
-	 * @see addSwitch addArgument addOption
-	 * Note: any one parameter can only have one flag
-	 */
-	void addShortOpt(QString name, QChar flag);
-
-	/**
-	 * @brief adds documentation to a Parameter
-	 * @param name the parameter name
-	 * @param metavar a string to be displayed as placeholder for the value
-	 * @param doc a QString containing the documentation
-	 * Note: on positional arguments, metavar replaces the name as displayed.
-	 *       on options , metavar replaces the value placeholder
-	 */
-	void addDocumentation(QString name, QString doc, QString metavar = QString());
-
-	/**
-	 * @brief generate a help message
-	 * @param progName the program name to use in the help message
-	 * @param helpIndent how much the parameter documentation should be indented
-	 * @param flagsInUsage whether we should use flags instead of options in the usage
-	 * @return a help message
-	 */
-	QString compileHelp(QString progName, int helpIndent = 22, bool flagsInUsage = true);
-
-	/**
-	 * @brief generate a short usage message
-	 * @param progName the program name to use in the usage message
-	 * @param useFlags whether we should use flags instead of options
-	 * @return a usage message
-	 */
-	QString compileUsage(QString progName, bool useFlags = true);
-
-	/**
-	 * @brief parse
-	 * @param argv a QStringList containing the program ARGV
-	 * @return a QHash mapping argument names to their values
-	 */
-	QHash<QString, QVariant> parse(QStringList argv);
-
-	/**
-	 * @brief clear all definitions
-	 */
-	void clear();
-
-	~Parser();
-
-private:
-	FlagStyle::Enum m_flagStyle;
-	ArgumentStyle::Enum m_argStyle;
-
-	enum OptionType
-	{
-		otSwitch,
-		otOption
-	};
-
-	// Important: the common part MUST BE COMMON ON ALL THREE structs
-	struct CommonDef
-	{
-		QString name;
-		QString doc;
-		QString metavar;
-		QVariant def;
-	};
-
-	struct OptionDef
-	{
-		// common
-		QString name;
-		QString doc;
-		QString metavar;
-		QVariant def;
-		// option
-		OptionType type;
-		QChar flag;
-	};
-
-	struct PositionalDef
-	{
-		// common
-		QString name;
-		QString doc;
-		QString metavar;
-		QVariant def;
-		// positional
-		bool required;
-	};
-
-	QHash<QString, OptionDef *> m_options;
-	QHash<QChar, OptionDef *> m_flags;
-	QHash<QString, CommonDef *> m_params;
-	QList<PositionalDef *> m_positionals;
-	QList<OptionDef *> m_optionList;
-
-	void getPrefix(QString &opt, QString &flag);
-};
-}
diff --git a/libraries/logic/DefaultVariable.h b/libraries/logic/DefaultVariable.h
deleted file mode 100644
index 38d7ecc2..00000000
--- a/libraries/logic/DefaultVariable.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-template <typename T>
-class DefaultVariable
-{
-public:
-	DefaultVariable(const T & value)
-	{
-		defaultValue = value;
-	}
-	DefaultVariable<T> & operator =(const T & value)
-	{
-		currentValue = value;
-		is_default = currentValue == defaultValue;
-		is_explicit = true;
-		return *this;
-	}
-	operator const T &() const
-	{
-		return is_default ? defaultValue : currentValue;
-	}
-	bool isDefault() const
-	{
-		return is_default;
-	}
-	bool isExplicit() const
-	{
-		return is_explicit;
-	}
-private:
-	T currentValue;
-	T defaultValue;
-	bool is_default = true;
-	bool is_explicit = false;
-};
diff --git a/libraries/logic/Env.cpp b/libraries/logic/Env.cpp
deleted file mode 100644
index cc0c5981..00000000
--- a/libraries/logic/Env.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "Env.h"
-#include "net/HttpMetaCache.h"
-#include "BaseVersion.h"
-#include "BaseVersionList.h"
-#include <QDir>
-#include <QNetworkProxy>
-#include <QNetworkAccessManager>
-#include <QDebug>
-#include "tasks/Task.h"
-#include "wonko/WonkoIndex.h"
-#include <QDebug>
-
-/*
- * The *NEW* global rat nest of an object. Handle with care.
- */
-
-Env::Env()
-{
-	m_qnam = std::make_shared<QNetworkAccessManager>();
-}
-
-void Env::destroy()
-{
-	m_metacache.reset();
-	m_qnam.reset();
-	m_versionLists.clear();
-}
-
-Env& Env::Env::getInstance()
-{
-	static Env instance;
-	return instance;
-}
-
-std::shared_ptr< HttpMetaCache > Env::metacache()
-{
-	Q_ASSERT(m_metacache != nullptr);
-	return m_metacache;
-}
-
-std::shared_ptr< QNetworkAccessManager > Env::qnam()
-{
-	return m_qnam;
-}
-
-/*
-class NullVersion : public BaseVersion
-{
-	Q_OBJECT
-public:
-	virtual QString name()
-	{
-		return "null";
-	}
-	virtual QString descriptor()
-	{
-		return "null";
-	}
-	virtual QString typeString() const
-	{
-		return "Null";
-	}
-};
-
-class NullTask: public Task
-{
-	Q_OBJECT
-public:
-	virtual void executeTask()
-	{
-		emitFailed(tr("Nothing to do."));
-	}
-};
-
-class NullVersionList: public BaseVersionList
-{
-	Q_OBJECT
-public:
-	virtual const BaseVersionPtr at(int i) const
-	{
-		return std::make_shared<NullVersion>();
-	}
-	virtual int count() const
-	{
-		return 0;
-	};
-	virtual Task* getLoadTask()
-	{
-		return new NullTask;
-	}
-	virtual bool isLoaded()
-	{
-		return false;
-	}
-	virtual void sort()
-	{
-	}
-	virtual void updateListData(QList< BaseVersionPtr >)
-	{
-	}
-};
-*/
-
-BaseVersionPtr Env::getVersion(QString component, QString version)
-{
-	auto list = getVersionList(component);
-	if(!list)
-	{
-		return nullptr;
-	}
-	return list->findVersion(version);
-}
-
-std::shared_ptr< BaseVersionList > Env::getVersionList(QString component)
-{
-	auto iter = m_versionLists.find(component);
-	if(iter != m_versionLists.end())
-	{
-		return *iter;
-	}
-	//return std::make_shared<NullVersionList>();
-	return nullptr;
-}
-
-void Env::registerVersionList(QString name, std::shared_ptr< BaseVersionList > vlist)
-{
-	m_versionLists[name] = vlist;
-}
-
-std::shared_ptr<WonkoIndex> Env::wonkoIndex()
-{
-	if (!m_wonkoIndex)
-	{
-		m_wonkoIndex = std::make_shared<WonkoIndex>();
-	}
-	return m_wonkoIndex;
-}
-
-
-void Env::initHttpMetaCache()
-{
-	m_metacache.reset(new HttpMetaCache("metacache"));
-	m_metacache->addBase("asset_indexes", QDir("assets/indexes").absolutePath());
-	m_metacache->addBase("asset_objects", QDir("assets/objects").absolutePath());
-	m_metacache->addBase("versions", QDir("versions").absolutePath());
-	m_metacache->addBase("libraries", QDir("libraries").absolutePath());
-	m_metacache->addBase("minecraftforge", QDir("mods/minecraftforge").absolutePath());
-	m_metacache->addBase("fmllibs", QDir("mods/minecraftforge/libs").absolutePath());
-	m_metacache->addBase("liteloader", QDir("mods/liteloader").absolutePath());
-	m_metacache->addBase("general", QDir("cache").absolutePath());
-	m_metacache->addBase("skins", QDir("accounts/skins").absolutePath());
-	m_metacache->addBase("root", QDir::currentPath());
-	m_metacache->addBase("translations", QDir("translations").absolutePath());
-	m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
-	m_metacache->addBase("wonko", QDir("cache/wonko").absolutePath());
-	m_metacache->Load();
-}
-
-void Env::updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password)
-{
-	// Set the application proxy settings.
-	if (proxyTypeStr == "SOCKS5")
-	{
-		QNetworkProxy::setApplicationProxy(
-			QNetworkProxy(QNetworkProxy::Socks5Proxy, addr, port, user, password));
-	}
-	else if (proxyTypeStr == "HTTP")
-	{
-		QNetworkProxy::setApplicationProxy(
-			QNetworkProxy(QNetworkProxy::HttpProxy, addr, port, user, password));
-	}
-	else if (proxyTypeStr == "None")
-	{
-		// If we have no proxy set, set no proxy and return.
-		QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::NoProxy));
-	}
-	else
-	{
-		// If we have "Default" selected, set Qt to use the system proxy settings.
-		QNetworkProxyFactory::setUseSystemConfiguration(true);
-	}
-
-	qDebug() << "Detecting proxy settings...";
-	QNetworkProxy proxy = QNetworkProxy::applicationProxy();
-	if (m_qnam.get())
-		m_qnam->setProxy(proxy);
-	QString proxyDesc;
-	if (proxy.type() == QNetworkProxy::NoProxy)
-	{
-		qDebug() << "Using no proxy is an option!";
-		return;
-	}
-	switch (proxy.type())
-	{
-	case QNetworkProxy::DefaultProxy:
-		proxyDesc = "Default proxy: ";
-		break;
-	case QNetworkProxy::Socks5Proxy:
-		proxyDesc = "Socks5 proxy: ";
-		break;
-	case QNetworkProxy::HttpProxy:
-		proxyDesc = "HTTP proxy: ";
-		break;
-	case QNetworkProxy::HttpCachingProxy:
-		proxyDesc = "HTTP caching: ";
-		break;
-	case QNetworkProxy::FtpCachingProxy:
-		proxyDesc = "FTP caching: ";
-		break;
-	default:
-		proxyDesc = "DERP proxy: ";
-		break;
-	}
-	proxyDesc += QString("%3@%1:%2 pass %4")
-					 .arg(proxy.hostName())
-					 .arg(proxy.port())
-					 .arg(proxy.user())
-					 .arg(proxy.password());
-	qDebug() << proxyDesc;
-}
-
-#include "Env.moc"
diff --git a/libraries/logic/Env.h b/libraries/logic/Env.h
deleted file mode 100644
index 4d8945d7..00000000
--- a/libraries/logic/Env.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <QString>
-#include <QMap>
-
-#include "multimc_logic_export.h"
-
-class QNetworkAccessManager;
-class HttpMetaCache;
-class BaseVersionList;
-class BaseVersion;
-class WonkoIndex;
-
-#if defined(ENV)
-	#undef ENV
-#endif
-#define ENV (Env::getInstance())
-
-class MULTIMC_LOGIC_EXPORT Env
-{
-	friend class MultiMC;
-private:
-	Env();
-public:
-	static Env& getInstance();
-
-	// call when Qt stuff is being torn down
-	void destroy();
-
-	std::shared_ptr<QNetworkAccessManager> qnam();
-
-	std::shared_ptr<HttpMetaCache> metacache();
-
-	/// init the cache. FIXME: possible future hook point
-	void initHttpMetaCache();
-
-	/// Updates the application proxy settings from the settings object.
-	void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);
-
-	/// get a version list by name
-	std::shared_ptr<BaseVersionList> getVersionList(QString component);
-
-	/// get a version by list name and version name
-	std::shared_ptr<BaseVersion> getVersion(QString component, QString version);
-
-	void registerVersionList(QString name, std::shared_ptr<BaseVersionList> vlist);
-
-	std::shared_ptr<WonkoIndex> wonkoIndex();
-
-	QString wonkoRootUrl() const { return m_wonkoRootUrl; }
-	void setWonkoRootUrl(const QString &url) { m_wonkoRootUrl = url; }
-
-protected:
-	std::shared_ptr<QNetworkAccessManager> m_qnam;
-	std::shared_ptr<HttpMetaCache> m_metacache;
-	QMap<QString, std::shared_ptr<BaseVersionList>> m_versionLists;
-	std::shared_ptr<WonkoIndex> m_wonkoIndex;
-	QString m_wonkoRootUrl;
-};
diff --git a/libraries/logic/Exception.h b/libraries/logic/Exception.h
deleted file mode 100644
index 30c7aa45..00000000
--- a/libraries/logic/Exception.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed under the Apache-2.0 license. See README.md for details.
-
-#pragma once
-
-#include <QString>
-#include <QDebug>
-#include <exception>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT Exception : public std::exception
-{
-public:
-	Exception(const QString &message) : std::exception(), m_message(message)
-	{
-		qCritical() << "Exception:" << message;
-	}
-	Exception(const Exception &other)
-		: std::exception(), m_message(other.cause())
-	{
-	}
-	virtual ~Exception() noexcept {}
-	const char *what() const noexcept
-	{
-		return m_message.toLatin1().constData();
-	}
-	QString cause() const
-	{
-		return m_message;
-	}
-
-private:
-	QString m_message;
-};
diff --git a/libraries/logic/FileSystem.cpp b/libraries/logic/FileSystem.cpp
deleted file mode 100644
index 049f1e38..00000000
--- a/libraries/logic/FileSystem.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-// Licensed under the Apache-2.0 license. See README.md for details.
-
-#include "FileSystem.h"
-
-#include <QDir>
-#include <QSaveFile>
-#include <QFileInfo>
-#include <QDebug>
-#include <QUrl>
-#include <QStandardPaths>
-
-namespace FS {
-
-void ensureExists(const QDir &dir)
-{
-	if (!QDir().mkpath(dir.absolutePath()))
-	{
-		throw FileSystemException("Unable to create directory " + dir.dirName() + " (" +
-									  dir.absolutePath() + ")");
-	}
-}
-
-void write(const QString &filename, const QByteArray &data)
-{
-	ensureExists(QFileInfo(filename).dir());
-	QSaveFile file(filename);
-	if (!file.open(QSaveFile::WriteOnly))
-	{
-		throw FileSystemException("Couldn't open " + filename + " for writing: " +
-								  file.errorString());
-	}
-	if (data.size() != file.write(data))
-	{
-		throw FileSystemException("Error writing data to " + filename + ": " +
-								  file.errorString());
-	}
-	if (!file.commit())
-	{
-		throw FileSystemException("Error while committing data to " + filename + ": " +
-								  file.errorString());
-	}
-}
-
-QByteArray read(const QString &filename)
-{
-	QFile file(filename);
-	if (!file.open(QFile::ReadOnly))
-	{
-		throw FileSystemException("Unable to open " + filename + " for reading: " +
-								  file.errorString());
-	}
-	const qint64 size = file.size();
-	QByteArray data(int(size), 0);
-	const qint64 ret = file.read(data.data(), size);
-	if (ret == -1 || ret != size)
-	{
-		throw FileSystemException("Error reading data from " + filename + ": " +
-								  file.errorString());
-	}
-	return data;
-}
-
-bool ensureFilePathExists(QString filenamepath)
-{
-	QFileInfo a(filenamepath);
-	QDir dir;
-	QString ensuredPath = a.path();
-	bool success = dir.mkpath(ensuredPath);
-	return success;
-}
-
-bool ensureFolderPathExists(QString foldernamepath)
-{
-	QFileInfo a(foldernamepath);
-	QDir dir;
-	QString ensuredPath = a.filePath();
-	bool success = dir.mkpath(ensuredPath);
-	return success;
-}
-
-bool copy::operator()(const QString &offset)
-{
-	//NOTE always deep copy on windows. the alternatives are too messy.
-	#if defined Q_OS_WIN32
-	m_followSymlinks = true;
-	#endif
-
-	auto src = PathCombine(m_src.absolutePath(), offset);
-	auto dst = PathCombine(m_dst.absolutePath(), offset);
-
-	QFileInfo currentSrc(src);
-	if (!currentSrc.exists())
-		return false;
-
-	if(!m_followSymlinks && currentSrc.isSymLink())
-	{
-		qDebug() << "creating symlink" << src << " - " << dst;
-		if (!ensureFilePathExists(dst))
-		{
-			qWarning() << "Cannot create path!";
-			return false;
-		}
-		return QFile::link(currentSrc.symLinkTarget(), dst);
-	}
-	else if(currentSrc.isFile())
-	{
-		qDebug() << "copying file" << src << " - " << dst;
-		if (!ensureFilePathExists(dst))
-		{
-			qWarning() << "Cannot create path!";
-			return false;
-		}
-		return QFile::copy(src, dst);
-	}
-	else if(currentSrc.isDir())
-	{
-		qDebug() << "recursing" << offset;
-		if (!ensureFolderPathExists(dst))
-		{
-			qWarning() << "Cannot create path!";
-			return false;
-		}
-		QDir currentDir(src);
-		for(auto & f : currentDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System))
-		{
-			auto inner_offset = PathCombine(offset, f);
-			// ignore and skip stuff that matches the blacklist.
-			if(m_blacklist && m_blacklist->matches(inner_offset))
-			{
-				continue;
-			}
-			if(!operator()(inner_offset))
-			{
-				return false;
-			}
-		}
-	}
-	else
-	{
-		qCritical() << "Copy ERROR: Unknown filesystem object:" << src;
-		return false;
-	}
-	return true;
-}
-
-
-#if defined Q_OS_WIN32
-#include <windows.h>
-#include <string>
-#endif
-bool deletePath(QString path)
-{
-	bool OK = true;
-	QDir dir(path);
-
-	if (!dir.exists())
-	{
-		return OK;
-	}
-	auto allEntries = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden |
-										QDir::AllDirs | QDir::Files,
-										QDir::DirsFirst);
-
-	for(auto & info: allEntries)
-	{
-#if defined Q_OS_WIN32
-		QString nativePath = QDir::toNativeSeparators(info.absoluteFilePath());
-		auto wString = nativePath.toStdWString();
-		DWORD dwAttrs = GetFileAttributesW(wString.c_str());
-		// Windows: check for junctions, reparse points and other nasty things of that sort
-		if(dwAttrs & FILE_ATTRIBUTE_REPARSE_POINT)
-		{
-			if (info.isFile())
-			{
-				OK &= QFile::remove(info.absoluteFilePath());
-			}
-			else if (info.isDir())
-			{
-				OK &= dir.rmdir(info.absoluteFilePath());
-			}
-		}
-#else
-		// We do not trust Qt with reparse points, but do trust it with unix symlinks.
-		if(info.isSymLink())
-		{
-			OK &= QFile::remove(info.absoluteFilePath());
-		}
-#endif
-		else if (info.isDir())
-		{
-			OK &= deletePath(info.absoluteFilePath());
-		}
-		else if (info.isFile())
-		{
-			OK &= QFile::remove(info.absoluteFilePath());
-		}
-		else
-		{
-			OK = false;
-			qCritical() << "Delete ERROR: Unknown filesystem object:" << info.absoluteFilePath();
-		}
-	}
-	OK &= dir.rmdir(dir.absolutePath());
-	return OK;
-}
-
-
-QString PathCombine(QString path1, QString path2)
-{
-	if(!path1.size())
-		return path2;
-	if(!path2.size())
-		return path1;
-    return QDir::cleanPath(path1 + QDir::separator() + path2);
-}
-
-QString PathCombine(QString path1, QString path2, QString path3)
-{
-	return PathCombine(PathCombine(path1, path2), path3);
-}
-
-QString AbsolutePath(QString path)
-{
-	return QFileInfo(path).absolutePath();
-}
-
-QString ResolveExecutable(QString path)
-{
-	if (path.isEmpty())
-	{
-		return QString();
-	}
-	if(!path.contains('/'))
-	{
-		path = QStandardPaths::findExecutable(path);
-	}
-	QFileInfo pathInfo(path);
-	if(!pathInfo.exists() || !pathInfo.isExecutable())
-	{
-		return QString();
-	}
-	return pathInfo.absoluteFilePath();
-}
-
-/**
- * Normalize path
- *
- * Any paths inside the current directory will be normalized to relative paths (to current)
- * Other paths will be made absolute
- */
-QString NormalizePath(QString path)
-{
-	QDir a = QDir::currentPath();
-	QString currentAbsolute = a.absolutePath();
-
-	QDir b(path);
-	QString newAbsolute = b.absolutePath();
-
-	if (newAbsolute.startsWith(currentAbsolute))
-	{
-		return a.relativeFilePath(newAbsolute);
-	}
-	else
-	{
-		return newAbsolute;
-	}
-}
-
-QString badFilenameChars = "\"\\/?<>:*|!";
-
-QString RemoveInvalidFilenameChars(QString string, QChar replaceWith)
-{
-	for (int i = 0; i < string.length(); i++)
-	{
-		if (badFilenameChars.contains(string[i]))
-		{
-			string[i] = replaceWith;
-		}
-	}
-	return string;
-}
-
-QString DirNameFromString(QString string, QString inDir)
-{
-	int num = 0;
-	QString baseName = RemoveInvalidFilenameChars(string, '-');
-	QString dirName;
-	do
-	{
-		if(num == 0)
-		{
-			dirName = baseName;
-		}
-		else
-		{
-			dirName = baseName + QString::number(num);;
-		}
-
-		// If it's over 9000
-		if (num > 9000)
-			return "";
-		num++;
-	} while (QFileInfo(PathCombine(inDir, dirName)).exists());
-	return dirName;
-}
-
-// Does the directory path contain any '!'? If yes, return true, otherwise false.
-// (This is a problem for Java)
-bool checkProblemticPathJava(QDir folder)
-{
-	QString pathfoldername = folder.absolutePath();
-	return pathfoldername.contains("!", Qt::CaseInsensitive);
-}
-
-#include <QStandardPaths>
-#include <QFile>
-#include <QTextStream>
-
-// Win32 crap
-#if defined Q_OS_WIN
-
-#include <windows.h>
-#include <winnls.h>
-#include <shobjidl.h>
-#include <objbase.h>
-#include <objidl.h>
-#include <shlguid.h>
-#include <shlobj.h>
-
-bool called_coinit = false;
-
-HRESULT CreateLink(LPCSTR linkPath, LPCSTR targetPath, LPCSTR args)
-{
-	HRESULT hres;
-
-	if (!called_coinit)
-	{
-		hres = CoInitialize(NULL);
-		called_coinit = true;
-
-		if (!SUCCEEDED(hres))
-		{
-			qWarning("Failed to initialize COM. Error 0x%08X", hres);
-			return hres;
-		}
-	}
-
-	IShellLink *link;
-	hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink,
-							(LPVOID *)&link);
-
-	if (SUCCEEDED(hres))
-	{
-		IPersistFile *persistFile;
-
-		link->SetPath(targetPath);
-		link->SetArguments(args);
-
-		hres = link->QueryInterface(IID_IPersistFile, (LPVOID *)&persistFile);
-		if (SUCCEEDED(hres))
-		{
-			WCHAR wstr[MAX_PATH];
-
-			MultiByteToWideChar(CP_ACP, 0, linkPath, -1, wstr, MAX_PATH);
-
-			hres = persistFile->Save(wstr, TRUE);
-			persistFile->Release();
-		}
-		link->Release();
-	}
-	return hres;
-}
-
-#endif
-
-QString getDesktopDir()
-{
-	return QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
-}
-
-// Cross-platform Shortcut creation
-bool createShortCut(QString location, QString dest, QStringList args, QString name,
-						  QString icon)
-{
-#if defined Q_OS_LINUX
-	location = PathCombine(location, name + ".desktop");
-
-	QFile f(location);
-	f.open(QIODevice::WriteOnly | QIODevice::Text);
-	QTextStream stream(&f);
-
-	QString argstring;
-	if (!args.empty())
-		argstring = " '" + args.join("' '") + "'";
-
-	stream << "[Desktop Entry]"
-		   << "\n";
-	stream << "Type=Application"
-		   << "\n";
-	stream << "TryExec=" << dest.toLocal8Bit() << "\n";
-	stream << "Exec=" << dest.toLocal8Bit() << argstring.toLocal8Bit() << "\n";
-	stream << "Name=" << name.toLocal8Bit() << "\n";
-	stream << "Icon=" << icon.toLocal8Bit() << "\n";
-
-	stream.flush();
-	f.close();
-
-	f.setPermissions(f.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeGroup |
-					 QFileDevice::ExeOther);
-
-	return true;
-#elif defined Q_OS_WIN
-	// TODO: Fix
-	//	QFile file(PathCombine(location, name + ".lnk"));
-	//	WCHAR *file_w;
-	//	WCHAR *dest_w;
-	//	WCHAR *args_w;
-	//	file.fileName().toWCharArray(file_w);
-	//	dest.toWCharArray(dest_w);
-
-	//	QString argStr;
-	//	for (int i = 0; i < args.count(); i++)
-	//	{
-	//		argStr.append(args[i]);
-	//		argStr.append(" ");
-	//	}
-	//	argStr.toWCharArray(args_w);
-
-	//	return SUCCEEDED(CreateLink(file_w, dest_w, args_w));
-	return false;
-#else
-	qWarning("Desktop Shortcuts not supported on your platform!");
-	return false;
-#endif
-}
-}
diff --git a/libraries/logic/FileSystem.h b/libraries/logic/FileSystem.h
deleted file mode 100644
index 80637f90..00000000
--- a/libraries/logic/FileSystem.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Licensed under the Apache-2.0 license. See README.md for details.
-
-#pragma once
-
-#include "Exception.h"
-#include "pathmatcher/IPathMatcher.h"
-
-#include "multimc_logic_export.h"
-#include <QDir>
-#include <QFlags>
-
-namespace FS
-{
-
-class MULTIMC_LOGIC_EXPORT FileSystemException : public ::Exception
-{
-public:
-	FileSystemException(const QString &message) : Exception(message) {}
-};
-
-/**
- * write data to a file safely
- */
-MULTIMC_LOGIC_EXPORT void write(const QString &filename, const QByteArray &data);
-
-/**
- * read data from a file safely\
- */
-MULTIMC_LOGIC_EXPORT QByteArray read(const QString &filename);
-
-/**
- * Creates all the folders in a path for the specified path
- * last segment of the path is treated as a file name and is ignored!
- */
-MULTIMC_LOGIC_EXPORT bool ensureFilePathExists(QString filenamepath);
-
-/**
- * Creates all the folders in a path for the specified path
- * last segment of the path is treated as a folder name and is created!
- */
-MULTIMC_LOGIC_EXPORT bool ensureFolderPathExists(QString filenamepath);
-
-class MULTIMC_LOGIC_EXPORT copy
-{
-public:
-	copy(const copy&) = delete;
-	copy(const QString & src, const QString & dst)
-	{
-		m_src = src;
-		m_dst = dst;
-	}
-	copy & followSymlinks(const bool follow)
-	{
-		m_followSymlinks = follow;
-		return *this;
-	}
-	copy & blacklist(const IPathMatcher * filter)
-	{
-		m_blacklist = filter;
-		return *this;
-	}
-	bool operator()()
-	{
-		return operator()(QString());
-	}
-
-private:
-	bool operator()(const QString &offset);
-
-private:
-	bool m_followSymlinks = true;
-	const IPathMatcher * m_blacklist = nullptr;
-	QDir m_src;
-	QDir m_dst;
-};
-
-/**
- * Delete a folder recursively
- */
-MULTIMC_LOGIC_EXPORT bool deletePath(QString path);
-
-MULTIMC_LOGIC_EXPORT QString PathCombine(QString path1, QString path2);
-MULTIMC_LOGIC_EXPORT QString PathCombine(QString path1, QString path2, QString path3);
-
-MULTIMC_LOGIC_EXPORT QString AbsolutePath(QString path);
-
-/**
- * Resolve an executable
- *
- * Will resolve:
- *   single executable (by name)
- *   relative path
- *   absolute path
- *
- * @return absolute path to executable or null string
- */
-MULTIMC_LOGIC_EXPORT QString ResolveExecutable(QString path);
-
-/**
- * Normalize path
- *
- * Any paths inside the current directory will be normalized to relative paths (to current)
- * Other paths will be made absolute
- *
- * Returns false if the path logic somehow filed (and normalizedPath in invalid)
- */
-MULTIMC_LOGIC_EXPORT QString NormalizePath(QString path);
-
-MULTIMC_LOGIC_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-');
-
-MULTIMC_LOGIC_EXPORT QString DirNameFromString(QString string, QString inDir = ".");
-
-/// Checks if the a given Path contains "!"
-MULTIMC_LOGIC_EXPORT bool checkProblemticPathJava(QDir folder);
-
-// Get the Directory representing the User's Desktop
-MULTIMC_LOGIC_EXPORT QString getDesktopDir();
-
-// Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
-// call it *name* and assign it the icon *icon*
-// return true if operation succeeded
-MULTIMC_LOGIC_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
-}
diff --git a/libraries/logic/GZip.cpp b/libraries/logic/GZip.cpp
deleted file mode 100644
index 38605df6..00000000
--- a/libraries/logic/GZip.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "GZip.h"
-#include <zlib.h>
-#include <QByteArray>
-
-bool GZip::unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes)
-{
-	if (compressedBytes.size() == 0)
-	{
-		uncompressedBytes = compressedBytes;
-		return true;
-	}
-
-	unsigned uncompLength = compressedBytes.size();
-	uncompressedBytes.clear();
-	uncompressedBytes.resize(uncompLength);
-
-	z_stream strm;
-	memset(&strm, 0, sizeof(strm));
-	strm.next_in = (Bytef *)compressedBytes.data();
-	strm.avail_in = compressedBytes.size();
-
-	bool done = false;
-
-	if (inflateInit2(&strm, (16 + MAX_WBITS)) != Z_OK)
-	{
-		return false;
-	}
-
-	int err = Z_OK;
-
-	while (!done)
-	{
-		// If our output buffer is too small
-		if (strm.total_out >= uncompLength)
-		{
-			uncompressedBytes.resize(uncompLength * 2);
-			uncompLength *= 2;
-		}
-
-		strm.next_out = (Bytef *)(uncompressedBytes.data() + strm.total_out);
-		strm.avail_out = uncompLength - strm.total_out;
-
-		// Inflate another chunk.
-		err = inflate(&strm, Z_SYNC_FLUSH);
-		if (err == Z_STREAM_END)
-			done = true;
-		else if (err != Z_OK)
-		{
-			break;
-		}
-	}
-
-	if (inflateEnd(&strm) != Z_OK || !done)
-	{
-		return false;
-	}
-
-	uncompressedBytes.resize(strm.total_out);
-	return true;
-}
-
-bool GZip::zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes)
-{
-	if (uncompressedBytes.size() == 0)
-	{
-		compressedBytes = uncompressedBytes;
-		return true;
-	}
-
-	unsigned compLength = std::min(uncompressedBytes.size(), 16);
-	compressedBytes.clear();
-	compressedBytes.resize(compLength);
-
-	z_stream zs;
-	memset(&zs, 0, sizeof(zs));
-
-	if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (16 + MAX_WBITS), 8, Z_DEFAULT_STRATEGY) != Z_OK)
-	{
-		return false;
-	}
-
-	zs.next_in = (Bytef*)uncompressedBytes.data();
-	zs.avail_in = uncompressedBytes.size();
-
-	int ret;
-	compressedBytes.resize(uncompressedBytes.size());
-
-	unsigned offset = 0;
-	unsigned temp = 0;
-	do
-	{
-		auto remaining = compressedBytes.size() - offset;
-		if(remaining < 1)
-		{
-			compressedBytes.resize(compressedBytes.size() * 2);
-		}
-		zs.next_out = (Bytef *) (compressedBytes.data() + offset);
-		temp = zs.avail_out = compressedBytes.size() - offset;
-		ret = deflate(&zs, Z_FINISH);
-		offset += temp - zs.avail_out;
-	} while (ret == Z_OK);
-
-	compressedBytes.resize(offset);
-
-	if (deflateEnd(&zs) != Z_OK)
-	{
-		return false;
-	}
-
-	if (ret != Z_STREAM_END)
-	{
-		return false;
-	}
-	return true;
-}
\ No newline at end of file
diff --git a/libraries/logic/GZip.h b/libraries/logic/GZip.h
deleted file mode 100644
index 6993a222..00000000
--- a/libraries/logic/GZip.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <QByteArray>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT GZip
-{
-public:
-	static bool unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes);
-	static bool zip(const QByteArray &uncompressedBytes, QByteArray &compressedBytes);
-};
-
diff --git a/libraries/logic/InstanceList.cpp b/libraries/logic/InstanceList.cpp
deleted file mode 100644
index 783df660..00000000
--- a/libraries/logic/InstanceList.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QDir>
-#include <QSet>
-#include <QFile>
-#include <QDirIterator>
-#include <QThread>
-#include <QTextStream>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QXmlStreamReader>
-#include <QRegularExpression>
-#include <QDebug>
-
-#include "InstanceList.h"
-#include "BaseInstance.h"
-
-//FIXME: this really doesn't belong *here*
-#include "minecraft/onesix/OneSixInstance.h"
-#include "minecraft/legacy/LegacyInstance.h"
-#include "minecraft/ftb/FTBPlugin.h"
-#include "minecraft/MinecraftVersion.h"
-#include "settings/INISettingsObject.h"
-#include "NullInstance.h"
-#include "FileSystem.h"
-#include "pathmatcher/RegexpMatcher.h"
-
-const static int GROUP_FILE_FORMAT_VERSION = 1;
-
-InstanceList::InstanceList(SettingsObjectPtr globalSettings, const QString &instDir, QObject *parent)
-	: QAbstractListModel(parent), m_instDir(instDir)
-{
-	m_globalSettings = globalSettings;
-	if (!QDir::current().exists(m_instDir))
-	{
-		QDir::current().mkpath(m_instDir);
-	}
-}
-
-InstanceList::~InstanceList()
-{
-}
-
-int InstanceList::rowCount(const QModelIndex &parent) const
-{
-	Q_UNUSED(parent);
-	return m_instances.count();
-}
-
-QModelIndex InstanceList::index(int row, int column, const QModelIndex &parent) const
-{
-	Q_UNUSED(parent);
-	if (row < 0 || row >= m_instances.size())
-		return QModelIndex();
-	return createIndex(row, column, (void *)m_instances.at(row).get());
-}
-
-QVariant InstanceList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-	{
-		return QVariant();
-	}
-	BaseInstance *pdata = static_cast<BaseInstance *>(index.internalPointer());
-	switch (role)
-	{
-	case InstancePointerRole:
-	{
-		QVariant v = qVariantFromValue((void *)pdata);
-		return v;
-	}
-	case InstanceIDRole:
-    {
-        return pdata->id();
-    }
-	case Qt::DisplayRole:
-	{
-		return pdata->name();
-	}
-	case Qt::ToolTipRole:
-	{
-		return pdata->instanceRoot();
-	}
-	case Qt::DecorationRole:
-	{
-		return pdata->iconKey();
-	}
-	// HACK: see GroupView.h in gui!
-	case GroupRole:
-	{
-		return pdata->group();
-	}
-	default:
-		break;
-	}
-	return QVariant();
-}
-
-Qt::ItemFlags InstanceList::flags(const QModelIndex &index) const
-{
-	Qt::ItemFlags f;
-	if (index.isValid())
-	{
-		f |= (Qt::ItemIsEnabled | Qt::ItemIsSelectable);
-	}
-	return f;
-}
-
-void InstanceList::groupChanged()
-{
-	// save the groups. save all of them.
-	saveGroupList();
-}
-
-QStringList InstanceList::getGroups()
-{
-	return m_groups.toList();
-}
-
-void InstanceList::suspendGroupSaving()
-{
-	suspendedGroupSave = true;
-}
-
-void InstanceList::resumeGroupSaving()
-{
-	if(suspendedGroupSave)
-	{
-		suspendedGroupSave = false;
-		if(queuedGroupSave)
-		{
-			saveGroupList();
-		}
-	}
-}
-
-void InstanceList::deleteGroup(const QString& name)
-{
-	for(auto & instance: m_instances)
-	{
-		auto instGroupName = instance->group();
-		if(instGroupName == name)
-		{
-			instance->setGroupPost(QString());
-		}
-	}
-}
-
-void InstanceList::saveGroupList()
-{
-	if(suspendedGroupSave)
-	{
-		queuedGroupSave = true;
-		return;
-	}
-
-	QString groupFileName = m_instDir + "/instgroups.json";
-	QMap<QString, QSet<QString>> groupMap;
-	for (auto instance : m_instances)
-	{
-		QString id = instance->id();
-		QString group = instance->group();
-		if (group.isEmpty())
-			continue;
-
-		// keep a list/set of groups for choosing
-		m_groups.insert(group);
-
-		if (!groupMap.count(group))
-		{
-			QSet<QString> set;
-			set.insert(id);
-			groupMap[group] = set;
-		}
-		else
-		{
-			QSet<QString> &set = groupMap[group];
-			set.insert(id);
-		}
-	}
-	QJsonObject toplevel;
-	toplevel.insert("formatVersion", QJsonValue(QString("1")));
-	QJsonObject groupsArr;
-	for (auto iter = groupMap.begin(); iter != groupMap.end(); iter++)
-	{
-		auto list = iter.value();
-		auto name = iter.key();
-		QJsonObject groupObj;
-		QJsonArray instanceArr;
-		groupObj.insert("hidden", QJsonValue(QString("false")));
-		for (auto item : list)
-		{
-			instanceArr.append(QJsonValue(item));
-		}
-		groupObj.insert("instances", instanceArr);
-		groupsArr.insert(name, groupObj);
-	}
-	toplevel.insert("groups", groupsArr);
-	QJsonDocument doc(toplevel);
-	try
-	{
-		FS::write(groupFileName, doc.toJson());
-	}
-	catch(FS::FileSystemException & e)
-	{
-		qCritical() << "Failed to write instance group file :" << e.cause();
-	}
-}
-
-void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
-{
-	QString groupFileName = m_instDir + "/instgroups.json";
-
-	// if there's no group file, fail
-	if (!QFileInfo(groupFileName).exists())
-		return;
-
-	QByteArray jsonData;
-	try
-	{
-		jsonData = FS::read(groupFileName);
-	}
-	catch (FS::FileSystemException & e)
-	{
-		qCritical() << "Failed to read instance group file :" << e.cause();
-		return;
-	}
-
-	QJsonParseError error;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &error);
-
-	// if the json was bad, fail
-	if (error.error != QJsonParseError::NoError)
-	{
-		qCritical() << QString("Failed to parse instance group file: %1 at offset %2")
-							.arg(error.errorString(), QString::number(error.offset))
-							.toUtf8();
-		return;
-	}
-
-	// if the root of the json wasn't an object, fail
-	if (!jsonDoc.isObject())
-	{
-		qWarning() << "Invalid group file. Root entry should be an object.";
-		return;
-	}
-
-	QJsonObject rootObj = jsonDoc.object();
-
-	// Make sure the format version matches, otherwise fail.
-	if (rootObj.value("formatVersion").toVariant().toInt() != GROUP_FILE_FORMAT_VERSION)
-		return;
-
-	// Get the groups. if it's not an object, fail
-	if (!rootObj.value("groups").isObject())
-	{
-		qWarning() << "Invalid group list JSON: 'groups' should be an object.";
-		return;
-	}
-
-	// Iterate through all the groups.
-	QJsonObject groupMapping = rootObj.value("groups").toObject();
-	for (QJsonObject::iterator iter = groupMapping.begin(); iter != groupMapping.end(); iter++)
-	{
-		QString groupName = iter.key();
-
-		// If not an object, complain and skip to the next one.
-		if (!iter.value().isObject())
-		{
-			qWarning() << QString("Group '%1' in the group list should "
-								   "be an object.")
-							   .arg(groupName)
-							   .toUtf8();
-			continue;
-		}
-
-		QJsonObject groupObj = iter.value().toObject();
-		if (!groupObj.value("instances").isArray())
-		{
-			qWarning() << QString("Group '%1' in the group list is invalid. "
-								   "It should contain an array "
-								   "called 'instances'.")
-							   .arg(groupName)
-							   .toUtf8();
-			continue;
-		}
-
-		// keep a list/set of groups for choosing
-		m_groups.insert(groupName);
-
-		// Iterate through the list of instances in the group.
-		QJsonArray instancesArray = groupObj.value("instances").toArray();
-
-		for (QJsonArray::iterator iter2 = instancesArray.begin(); iter2 != instancesArray.end();
-			 iter2++)
-		{
-			groupMap[(*iter2).toString()] = groupName;
-		}
-	}
-}
-
-InstanceList::InstListError InstanceList::loadList()
-{
-	// load the instance groups
-	QMap<QString, QString> groupMap;
-	loadGroupList(groupMap);
-
-	QList<InstancePtr> tempList;
-	{
-		QDirIterator iter(m_instDir, QDir::Dirs | QDir::NoDot | QDir::NoDotDot | QDir::Readable,
-						  QDirIterator::FollowSymlinks);
-		while (iter.hasNext())
-		{
-			QString subDir = iter.next();
-			if (!QFileInfo(FS::PathCombine(subDir, "instance.cfg")).exists())
-				continue;
-			qDebug() << "Loading MultiMC instance from " << subDir;
-			InstancePtr instPtr;
-			auto error = loadInstance(instPtr, subDir);
-			if(!continueProcessInstance(instPtr, error, subDir, groupMap))
-				continue;
-			tempList.append(instPtr);
-		}
-	}
-
-	// FIXME: generalize
-	FTBPlugin::loadInstances(m_globalSettings, groupMap, tempList);
-
-	beginResetModel();
-	m_instances.clear();
-	for(auto inst: tempList)
-	{
-		inst->setParent(this);
-		connect(inst.get(), SIGNAL(propertiesChanged(BaseInstance *)), this,
-				SLOT(propertiesChanged(BaseInstance *)));
-		connect(inst.get(), SIGNAL(groupChanged()), this, SLOT(groupChanged()));
-		connect(inst.get(), SIGNAL(nuked(BaseInstance *)), this,
-				SLOT(instanceNuked(BaseInstance *)));
-		m_instances.append(inst);
-	}
-	endResetModel();
-	emit dataIsInvalid();
-	return NoError;
-}
-
-/// Clear all instances. Triggers notifications.
-void InstanceList::clear()
-{
-	beginResetModel();
-	saveGroupList();
-	m_instances.clear();
-	endResetModel();
-	emit dataIsInvalid();
-}
-
-void InstanceList::on_InstFolderChanged(const Setting &setting, QVariant value)
-{
-	m_instDir = value.toString();
-	loadList();
-}
-
-/// Add an instance. Triggers notifications, returns the new index
-int InstanceList::add(InstancePtr t)
-{
-	beginInsertRows(QModelIndex(), m_instances.size(), m_instances.size());
-	m_instances.append(t);
-	t->setParent(this);
-	connect(t.get(), SIGNAL(propertiesChanged(BaseInstance *)), this,
-			SLOT(propertiesChanged(BaseInstance *)));
-	connect(t.get(), SIGNAL(groupChanged()), this, SLOT(groupChanged()));
-	connect(t.get(), SIGNAL(nuked(BaseInstance *)), this, SLOT(instanceNuked(BaseInstance *)));
-	endInsertRows();
-	return count() - 1;
-}
-
-InstancePtr InstanceList::getInstanceById(QString instId) const
-{
-	if(instId.isEmpty())
-		return InstancePtr();
-	for(auto & inst: m_instances)
-	{
-		if (inst->id() == instId)
-		{
-			return inst;
-		}
-	}
-	return InstancePtr();
-}
-
-QModelIndex InstanceList::getInstanceIndexById(const QString &id) const
-{
-	return index(getInstIndex(getInstanceById(id).get()));
-}
-
-int InstanceList::getInstIndex(BaseInstance *inst) const
-{
-	int count = m_instances.count();
-	for (int i = 0; i < count; i++)
-	{
-		if (inst == m_instances[i].get())
-		{
-			return i;
-		}
-	}
-	return -1;
-}
-
-bool InstanceList::continueProcessInstance(InstancePtr instPtr, const int error,
-										   const QDir &dir, QMap<QString, QString> &groupMap)
-{
-	if (error != InstanceList::NoLoadError && error != InstanceList::NotAnInstance)
-	{
-		QString errorMsg = QString("Failed to load instance %1: ")
-							   .arg(QFileInfo(dir.absolutePath()).baseName())
-							   .toUtf8();
-
-		switch (error)
-		{
-		default:
-			errorMsg += QString("Unknown instance loader error %1").arg(error);
-			break;
-		}
-		qCritical() << errorMsg.toUtf8();
-		return false;
-	}
-	else if (!instPtr)
-	{
-		qCritical() << QString("Error loading instance %1. Instance loader returned null.")
-							.arg(QFileInfo(dir.absolutePath()).baseName())
-							.toUtf8();
-		return false;
-	}
-	else
-	{
-		auto iter = groupMap.find(instPtr->id());
-		if (iter != groupMap.end())
-		{
-			instPtr->setGroupInitial((*iter));
-		}
-		qDebug() << "Loaded instance " << instPtr->name() << " from " << dir.absolutePath();
-		return true;
-	}
-}
-
-InstanceList::InstLoadError
-InstanceList::loadInstance(InstancePtr &inst, const QString &instDir)
-{
-	auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(instDir, "instance.cfg"));
-
-	instanceSettings->registerSetting("InstanceType", "Legacy");
-
-	QString inst_type = instanceSettings->get("InstanceType").toString();
-
-	// FIXME: replace with a map lookup, where instance classes register their types
-	if (inst_type == "OneSix" || inst_type == "Nostalgia")
-	{
-		inst.reset(new OneSixInstance(m_globalSettings, instanceSettings, instDir));
-	}
-	else if (inst_type == "Legacy")
-	{
-		inst.reset(new LegacyInstance(m_globalSettings, instanceSettings, instDir));
-	}
-	else
-	{
-		inst.reset(new NullInstance(m_globalSettings, instanceSettings, instDir));
-	}
-	inst->init();
-	return NoLoadError;
-}
-
-InstanceList::InstCreateError
-InstanceList::createInstance(InstancePtr &inst, BaseVersionPtr version, const QString &instDir)
-{
-	QDir rootDir(instDir);
-
-	qDebug() << instDir.toUtf8();
-	if (!rootDir.exists() && !rootDir.mkpath("."))
-	{
-		qCritical() << "Can't create instance folder" << instDir;
-		return InstanceList::CantCreateDir;
-	}
-
-	if (!version)
-	{
-		qCritical() << "Can't create instance for non-existing MC version";
-		return InstanceList::NoSuchVersion;
-	}
-
-	auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(instDir, "instance.cfg"));
-	instanceSettings->registerSetting("InstanceType", "Legacy");
-
-	auto minecraftVersion = std::dynamic_pointer_cast<MinecraftVersion>(version);
-	if(minecraftVersion)
-	{
-		auto mcVer = std::dynamic_pointer_cast<MinecraftVersion>(version);
-		instanceSettings->set("InstanceType", "OneSix");
-		inst.reset(new OneSixInstance(m_globalSettings, instanceSettings, instDir));
-		inst->setIntendedVersionId(version->descriptor());
-		inst->init();
-		return InstanceList::NoCreateError;
-	}
-	return InstanceList::NoSuchVersion;
-}
-
-InstanceList::InstCreateError
-InstanceList::copyInstance(InstancePtr &newInstance, InstancePtr &oldInstance, const QString &instDir, bool copySaves)
-{
-	QDir rootDir(instDir);
-	std::unique_ptr<IPathMatcher> matcher;
-	if(!copySaves)
-	{
-		auto matcherReal = new RegexpMatcher("[.]?minecraft/saves");
-		matcherReal->caseSensitive(false);
-		matcher.reset(matcherReal);
-	}
-
-	qDebug() << instDir.toUtf8();
-	FS::copy folderCopy(oldInstance->instanceRoot(), instDir);
-	folderCopy.followSymlinks(false).blacklist(matcher.get());
-	if (!folderCopy())
-	{
-		FS::deletePath(instDir);
-		return InstanceList::CantCreateDir;
-	}
-
-	INISettingsObject settings_obj(FS::PathCombine(instDir, "instance.cfg"));
-	settings_obj.registerSetting("InstanceType", "Legacy");
-	QString inst_type = settings_obj.get("InstanceType").toString();
-
-	oldInstance->copy(instDir);
-
-	auto error = loadInstance(newInstance, instDir);
-
-	switch (error)
-	{
-	case NoLoadError:
-		return NoCreateError;
-	case NotAnInstance:
-		rootDir.removeRecursively();
-		return CantCreateDir;
-	default:
-	case UnknownLoadError:
-		rootDir.removeRecursively();
-		return UnknownCreateError;
-	}
-}
-
-void InstanceList::instanceNuked(BaseInstance *inst)
-{
-	int i = getInstIndex(inst);
-	if (i != -1)
-	{
-		beginRemoveRows(QModelIndex(), i, i);
-		m_instances.removeAt(i);
-		endRemoveRows();
-	}
-}
-
-void InstanceList::propertiesChanged(BaseInstance *inst)
-{
-	int i = getInstIndex(inst);
-	if (i != -1)
-	{
-		emit dataChanged(index(i), index(i));
-	}
-}
diff --git a/libraries/logic/InstanceList.h b/libraries/logic/InstanceList.h
deleted file mode 100644
index 074cca7c..00000000
--- a/libraries/logic/InstanceList.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QSet>
-
-#include "BaseInstance.h"
-
-#include "multimc_logic_export.h"
-
-class BaseInstance;
-class QDir;
-
-class MULTIMC_LOGIC_EXPORT InstanceList : public QAbstractListModel
-{
-	Q_OBJECT
-private:
-	void loadGroupList(QMap<QString, QString> &groupList);
-	void suspendGroupSaving();
-	void resumeGroupSaving();
-
-public slots:
-	void saveGroupList();
-
-public:
-	explicit InstanceList(SettingsObjectPtr globalSettings, const QString &instDir, QObject *parent = 0);
-	virtual ~InstanceList();
-
-public:
-	QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
-	int rowCount(const QModelIndex &parent = QModelIndex()) const;
-	QVariant data(const QModelIndex &index, int role) const;
-	Qt::ItemFlags flags(const QModelIndex &index) const;
-
-	enum AdditionalRoles
-	{
-		GroupRole = Qt::UserRole,
-		InstancePointerRole = 0x34B1CB48, ///< Return pointer to real instance
-		InstanceIDRole = 0x34B1CB49 ///< Return id if the instance
-	};
-	/*!
-	 * \brief Error codes returned by functions in the InstanceList class.
-	 * NoError Indicates that no error occurred.
-	 * UnknownError indicates that an unspecified error occurred.
-	 */
-	enum InstListError
-	{
-		NoError = 0,
-		UnknownError
-	};
-
-	enum InstLoadError
-	{
-		NoLoadError = 0,
-		UnknownLoadError,
-		NotAnInstance
-	};
-
-	enum InstCreateError
-	{
-		NoCreateError = 0,
-		NoSuchVersion,
-		UnknownCreateError,
-		InstExists,
-		CantCreateDir
-	};
-
-	QString instDir() const
-	{
-		return m_instDir;
-	}
-
-	/*!
-	 * \brief Get the instance at index
-	 */
-	InstancePtr at(int i) const
-	{
-		return m_instances.at(i);
-	}
-	;
-
-	/*!
-	 * \brief Get the count of loaded instances
-	 */
-	int count() const
-	{
-		return m_instances.count();
-	}
-	;
-
-	/// Clear all instances. Triggers notifications.
-	void clear();
-
-	/// Add an instance. Triggers notifications, returns the new index
-	int add(InstancePtr t);
-
-	/// Get an instance by ID
-	InstancePtr getInstanceById(QString id) const;
-
-	QModelIndex getInstanceIndexById(const QString &id) const;
-
-	// FIXME: instead of iterating through all instances and forming a set, keep the set around
-	QStringList getGroups();
-
-	void deleteGroup(const QString & name);
-
-	/*!
-	 * \brief Creates a stub instance
-	 *
-	 * \param inst Pointer to store the created instance in.
-	 * \param version Game version to use for the instance
-	 * \param instDir The new instance's directory.
-	 * \return An InstCreateError error code.
-	 * - InstExists if the given instance directory is already an instance.
-	 * - CantCreateDir if the given instance directory cannot be created.
-	 */
-	InstCreateError createInstance(InstancePtr &inst, BaseVersionPtr version,
-								   const QString &instDir);
-
-	/*!
-	 * \brief Creates a copy of an existing instance with a new name
-	 *
-	 * \param newInstance Pointer to store the created instance in.
-	 * \param oldInstance The instance to copy
-	 * \param instDir The new instance's directory.
-	 * \return An InstCreateError error code.
-	 * - InstExists if the given instance directory is already an instance.
-	 * - CantCreateDir if the given instance directory cannot be created.
-	 */
-	InstCreateError copyInstance(InstancePtr &newInstance, InstancePtr &oldInstance,
-								 const QString &instDir, bool copySaves);
-
-	/*!
-	 * \brief Loads an instance from the given directory.
-	 * Checks the instance's INI file to figure out what the instance's type is first.
-	 * \param inst Pointer to store the loaded instance in.
-	 * \param instDir The instance's directory.
-	 * \return An InstLoadError error code.
-	 * - NotAnInstance if the given instance directory isn't a valid instance.
-	 */
-	InstLoadError loadInstance(InstancePtr &inst, const QString &instDir);
-
-signals:
-	void dataIsInvalid();
-
-public slots:
-	void on_InstFolderChanged(const Setting &setting, QVariant value);
-
-	/*!
-	 * \brief Loads the instance list. Triggers notifications.
-	 */
-	InstListError loadList();
-
-private slots:
-	void propertiesChanged(BaseInstance *inst);
-	void instanceNuked(BaseInstance *inst);
-	void groupChanged();
-
-private:
-	int getInstIndex(BaseInstance *inst) const;
-
-public:
-	static bool continueProcessInstance(InstancePtr instPtr, const int error, const QDir &dir, QMap<QString, QString> &groupMap);
-
-protected:
-	QString m_instDir;
-	QList<InstancePtr> m_instances;
-	QSet<QString> m_groups;
-	SettingsObjectPtr m_globalSettings;
-	bool suspendedGroupSave = false;
-	bool queuedGroupSave = false;
-};
diff --git a/libraries/logic/Json.cpp b/libraries/logic/Json.cpp
deleted file mode 100644
index f2cbc8a3..00000000
--- a/libraries/logic/Json.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// Licensed under the Apache-2.0 license. See README.md for details.
-
-#include "Json.h"
-
-#include <QFile>
-
-#include "FileSystem.h"
-#include <math.h>
-
-namespace Json
-{
-void write(const QJsonDocument &doc, const QString &filename)
-{
-	FS::write(filename, doc.toJson());
-}
-void write(const QJsonObject &object, const QString &filename)
-{
-	write(QJsonDocument(object), filename);
-}
-void write(const QJsonArray &array, const QString &filename)
-{
-	write(QJsonDocument(array), filename);
-}
-
-QByteArray toBinary(const QJsonObject &obj)
-{
-	return QJsonDocument(obj).toBinaryData();
-}
-QByteArray toBinary(const QJsonArray &array)
-{
-	return QJsonDocument(array).toBinaryData();
-}
-QByteArray toText(const QJsonObject &obj)
-{
-	return QJsonDocument(obj).toJson(QJsonDocument::Compact);
-}
-QByteArray toText(const QJsonArray &array)
-{
-	return QJsonDocument(array).toJson(QJsonDocument::Compact);
-}
-
-static bool isBinaryJson(const QByteArray &data)
-{
-	decltype(QJsonDocument::BinaryFormatTag) tag = QJsonDocument::BinaryFormatTag;
-	return memcmp(data.constData(), &tag, sizeof(QJsonDocument::BinaryFormatTag)) == 0;
-}
-QJsonDocument requireDocument(const QByteArray &data, const QString &what)
-{
-	if (isBinaryJson(data))
-	{
-		QJsonDocument doc = QJsonDocument::fromBinaryData(data);
-		if (doc.isNull())
-		{
-			throw JsonException(what + ": Invalid JSON (binary JSON detected)");
-		}
-		return doc;
-	}
-	else
-	{
-		QJsonParseError error;
-		QJsonDocument doc = QJsonDocument::fromJson(data, &error);
-		if (error.error != QJsonParseError::NoError)
-		{
-			throw JsonException(what + ": Error parsing JSON: " + error.errorString());
-		}
-		return doc;
-	}
-}
-QJsonDocument requireDocument(const QString &filename, const QString &what)
-{
-	return requireDocument(FS::read(filename), what);
-}
-QJsonObject requireObject(const QJsonDocument &doc, const QString &what)
-{
-	if (!doc.isObject())
-	{
-		throw JsonException(what + " is not an object");
-	}
-	return doc.object();
-}
-QJsonArray requireArray(const QJsonDocument &doc, const QString &what)
-{
-	if (!doc.isArray())
-	{
-		throw JsonException(what + " is not an array");
-	}
-	return doc.array();
-}
-
-void writeString(QJsonObject &to, const QString &key, const QString &value)
-{
-	if (!value.isEmpty())
-	{
-		to.insert(key, value);
-	}
-}
-
-void writeStringList(QJsonObject &to, const QString &key, const QStringList &values)
-{
-	if (!values.isEmpty())
-	{
-		QJsonArray array;
-		for(auto value: values)
-		{
-			array.append(value);
-		}
-		to.insert(key, array);
-	}
-}
-
-template<>
-QJsonValue toJson<QUrl>(const QUrl &url)
-{
-	return QJsonValue(url.toString(QUrl::FullyEncoded));
-}
-template<>
-QJsonValue toJson<QByteArray>(const QByteArray &data)
-{
-	return QJsonValue(QString::fromLatin1(data.toHex()));
-}
-template<>
-QJsonValue toJson<QDateTime>(const QDateTime &datetime)
-{
-	return QJsonValue(datetime.toString(Qt::ISODate));
-}
-template<>
-QJsonValue toJson<QDir>(const QDir &dir)
-{
-	return QDir::current().relativeFilePath(dir.absolutePath());
-}
-template<>
-QJsonValue toJson<QUuid>(const QUuid &uuid)
-{
-	return uuid.toString();
-}
-template<>
-QJsonValue toJson<QVariant>(const QVariant &variant)
-{
-	return QJsonValue::fromVariant(variant);
-}
-
-
-template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what)
-{
-	const QString string = ensureIsType<QString>(value, what);
-	// ensure that the string can be safely cast to Latin1
-	if (string != QString::fromLatin1(string.toLatin1()))
-	{
-		throw JsonException(what + " is not encodable as Latin1");
-	}
-	return QByteArray::fromHex(string.toLatin1());
-}
-
-template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what)
-{
-	if (!value.isArray())
-	{
-		throw JsonException(what + " is not an array");
-	}
-	return value.toArray();
-}
-
-
-template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what)
-{
-	if (!value.isString())
-	{
-		throw JsonException(what + " is not a string");
-	}
-	return value.toString();
-}
-
-template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what)
-{
-	if (!value.isBool())
-	{
-		throw JsonException(what + " is not a bool");
-	}
-	return value.toBool();
-}
-
-template<> double requireIsType<double>(const QJsonValue &value, const QString &what)
-{
-	if (!value.isDouble())
-	{
-		throw JsonException(what + " is not a double");
-	}
-	return value.toDouble();
-}
-
-template<> int requireIsType<int>(const QJsonValue &value, const QString &what)
-{
-	const double doubl = requireIsType<double>(value, what);
-	if (fmod(doubl, 1) != 0)
-	{
-		throw JsonException(what + " is not an integer");
-	}
-	return int(doubl);
-}
-
-template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what)
-{
-	const QString string = requireIsType<QString>(value, what);
-	const QDateTime datetime = QDateTime::fromString(string, Qt::ISODate);
-	if (!datetime.isValid())
-	{
-		throw JsonException(what + " is not a ISO formatted date/time value");
-	}
-	return datetime;
-}
-
-template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what)
-{
-	const QString string = ensureIsType<QString>(value, what);
-	if (string.isEmpty())
-	{
-		return QUrl();
-	}
-	const QUrl url = QUrl(string, QUrl::StrictMode);
-	if (!url.isValid())
-	{
-		throw JsonException(what + " is not a correctly formatted URL");
-	}
-	return url;
-}
-
-template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what)
-{
-	const QString string = requireIsType<QString>(value, what);
-	// FIXME: does not handle invalid characters!
-	return QDir::current().absoluteFilePath(string);
-}
-
-template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what)
-{
-	const QString string = requireIsType<QString>(value, what);
-	const QUuid uuid = QUuid(string);
-	if (uuid.toString() != string) // converts back => valid
-	{
-		throw JsonException(what + " is not a valid UUID");
-	}
-	return uuid;
-}
-
-template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what)
-{
-	if (!value.isObject())
-	{
-		throw JsonException(what + " is not an object");
-	}
-	return value.toObject();
-}
-
-template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what)
-{
-	if (value.isNull() || value.isUndefined())
-	{
-		throw JsonException(what + " is null or undefined");
-	}
-	return value.toVariant();
-}
-
-template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what)
-{
-	if (value.isNull() || value.isUndefined())
-	{
-		throw JsonException(what + " is null or undefined");
-	}
-	return value;
-}
-
-}
diff --git a/libraries/logic/Json.h b/libraries/logic/Json.h
deleted file mode 100644
index 2cb60f0e..00000000
--- a/libraries/logic/Json.h
+++ /dev/null
@@ -1,249 +0,0 @@
-// Licensed under the Apache-2.0 license. See README.md for details.
-
-#pragma once
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QDateTime>
-#include <QUrl>
-#include <QDir>
-#include <QUuid>
-#include <QVariant>
-#include <memory>
-
-#include "Exception.h"
-
-namespace Json
-{
-class MULTIMC_LOGIC_EXPORT JsonException : public ::Exception
-{
-public:
-	JsonException(const QString &message) : Exception(message) {}
-};
-
-/// @throw FileSystemException
-void write(const QJsonDocument &doc, const QString &filename);
-/// @throw FileSystemException
-void write(const QJsonObject &object, const QString &filename);
-/// @throw FileSystemException
-void write(const QJsonArray &array, const QString &filename);
-
-QByteArray toBinary(const QJsonObject &obj);
-QByteArray toBinary(const QJsonArray &array);
-QByteArray toText(const QJsonObject &obj);
-QByteArray toText(const QJsonArray &array);
-
-/// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document");
-/// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QString &filename, const QString &what = "Document");
-/// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonObject requireObject(const QJsonDocument &doc, const QString &what = "Document");
-/// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonArray requireArray(const QJsonDocument &doc, const QString &what = "Document");
-
-/////////////////// WRITING ////////////////////
-
-void writeString(QJsonObject & to, const QString &key, const QString &value);
-void writeStringList(QJsonObject & to, const QString &key, const QStringList &values);
-
-template<typename T>
-QJsonValue toJson(const T &t)
-{
-	return QJsonValue(t);
-}
-template<>
-QJsonValue toJson<QUrl>(const QUrl &url);
-template<>
-QJsonValue toJson<QByteArray>(const QByteArray &data);
-template<>
-QJsonValue toJson<QDateTime>(const QDateTime &datetime);
-template<>
-QJsonValue toJson<QDir>(const QDir &dir);
-template<>
-QJsonValue toJson<QUuid>(const QUuid &uuid);
-template<>
-QJsonValue toJson<QVariant>(const QVariant &variant);
-
-template<typename T>
-QJsonArray toJsonArray(const QList<T> &container)
-{
-	QJsonArray array;
-	for (const T item : container)
-	{
-		array.append(toJson<T>(item));
-	}
-	return array;
-}
-
-////////////////// READING ////////////////////
-
-/// @throw JsonException
-template <typename T>
-T requireIsType(const QJsonValue &value, const QString &what = "Value");
-
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT double requireIsType<double>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT bool requireIsType<bool>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT int requireIsType<int>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QString requireIsType<QString>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QDir requireIsType<QDir>(const QJsonValue &value, const QString &what);
-/// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what);
-
-// the following functions are higher level functions, that make use of the above functions for
-// type conversion
-template <typename T>
-T ensureIsType(const QJsonValue &value, const T default_ = T(), const QString &what = "Value")
-{
-	if (value.isUndefined() || value.isNull())
-	{
-		return default_;
-	}
-	try
-	{
-		return requireIsType<T>(value, what);
-	}
-	catch (JsonException &)
-	{
-		return default_;
-	}
-}
-
-/// @throw JsonException
-template <typename T>
-T requireIsType(const QJsonObject &parent, const QString &key, const QString &what = "__placeholder__")
-{
-	const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-	if (!parent.contains(key))
-	{
-		throw JsonException(localWhat + "s parent does not contain " + localWhat);
-	}
-	return requireIsType<T>(parent.value(key), localWhat);
-}
-
-template <typename T>
-T ensureIsType(const QJsonObject &parent, const QString &key, const T default_ = T(), const QString &what = "__placeholder__")
-{
-	const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-	if (!parent.contains(key))
-	{
-		return default_;
-	}
-	return ensureIsType<T>(parent.value(key), default_, localWhat);
-}
-
-template <typename T>
-QVector<T> requireIsArrayOf(const QJsonDocument &doc)
-{
-	const QJsonArray array = requireArray(doc);
-	QVector<T> out;
-	for (const QJsonValue val : array)
-	{
-		out.append(requireIsType<T>(val, "Document"));
-	}
-	return out;
-}
-
-template <typename T>
-QVector<T> ensureIsArrayOf(const QJsonValue &value, const QString &what = "Value")
-{
-	const QJsonArray array = ensureIsType<QJsonArray>(value, QJsonArray(), what);
-	QVector<T> out;
-	for (const QJsonValue val : array)
-	{
-		out.append(requireIsType<T>(val, what));
-	}
-	return out;
-}
-
-template <typename T>
-QVector<T> ensureIsArrayOf(const QJsonValue &value, const QVector<T> default_, const QString &what = "Value")
-{
-	if (value.isUndefined())
-	{
-		return default_;
-	}
-	return ensureIsArrayOf<T>(value, what);
-}
-
-/// @throw JsonException
-template <typename T>
-QVector<T> requireIsArrayOf(const QJsonObject &parent, const QString &key, const QString &what = "__placeholder__")
-{
-	const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-	if (!parent.contains(key))
-	{
-		throw JsonException(localWhat + "s parent does not contain " + localWhat);
-	}
-	return ensureIsArrayOf<T>(parent.value(key), localWhat);
-}
-
-template <typename T>
-QVector<T> ensureIsArrayOf(const QJsonObject &parent, const QString &key,
-						 const QVector<T> &default_ = QVector<T>(), const QString &what = "__placeholder__")
-{
-	const QString localWhat = QString(what).replace("__placeholder__", '\'' + key + '\'');
-	if (!parent.contains(key))
-	{
-		return default_;
-	}
-	return ensureIsArrayOf<T>(parent.value(key), default_, localWhat);
-}
-
-// this macro part could be replaced by variadic functions that just pass on their arguments, but that wouldn't work well with IDE helpers
-#define JSON_HELPERFUNCTIONS(NAME, TYPE) \
-	inline TYPE require##NAME(const QJsonValue &value, const QString &what = "Value") \
-	{ \
-		return requireIsType<TYPE>(value, what); \
-	} \
-	inline TYPE ensure##NAME(const QJsonValue &value, const TYPE default_ = TYPE(), const QString &what = "Value") \
-	{ \
-		return ensureIsType<TYPE>(value, default_, what); \
-	} \
-	inline TYPE require##NAME(const QJsonObject &parent, const QString &key, const QString &what = "__placeholder__") \
-	{ \
-		return requireIsType<TYPE>(parent, key, what); \
-	} \
-	inline TYPE ensure##NAME(const QJsonObject &parent, const QString &key, const TYPE default_ = TYPE(), const QString &what = "__placeholder") \
-	{ \
-		return ensureIsType<TYPE>(parent, key, default_, what); \
-	}
-
-JSON_HELPERFUNCTIONS(Array, QJsonArray)
-JSON_HELPERFUNCTIONS(Object, QJsonObject)
-JSON_HELPERFUNCTIONS(JsonValue, QJsonValue)
-JSON_HELPERFUNCTIONS(String, QString)
-JSON_HELPERFUNCTIONS(Boolean, bool)
-JSON_HELPERFUNCTIONS(Double, double)
-JSON_HELPERFUNCTIONS(Integer, int)
-JSON_HELPERFUNCTIONS(DateTime, QDateTime)
-JSON_HELPERFUNCTIONS(Url, QUrl)
-JSON_HELPERFUNCTIONS(ByteArray, QByteArray)
-JSON_HELPERFUNCTIONS(Dir, QDir)
-JSON_HELPERFUNCTIONS(Uuid, QUuid)
-JSON_HELPERFUNCTIONS(Variant, QVariant)
-
-#undef JSON_HELPERFUNCTIONS
-
-}
-using JSONValidationError = Json::JsonException;
diff --git a/libraries/logic/MMCStrings.cpp b/libraries/logic/MMCStrings.cpp
deleted file mode 100644
index c50d596e..00000000
--- a/libraries/logic/MMCStrings.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "MMCStrings.h"
-
-/// TAKEN FROM Qt, because it doesn't expose it intelligently
-static inline QChar getNextChar(const QString &s, int location)
-{
-	return (location < s.length()) ? s.at(location) : QChar();
-}
-
-/// TAKEN FROM Qt, because it doesn't expose it intelligently
-int Strings::naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs)
-{
-	for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2)
-	{
-		// skip spaces, tabs and 0's
-		QChar c1 = getNextChar(s1, l1);
-		while (c1.isSpace())
-			c1 = getNextChar(s1, ++l1);
-		QChar c2 = getNextChar(s2, l2);
-		while (c2.isSpace())
-			c2 = getNextChar(s2, ++l2);
-
-		if (c1.isDigit() && c2.isDigit())
-		{
-			while (c1.digitValue() == 0)
-				c1 = getNextChar(s1, ++l1);
-			while (c2.digitValue() == 0)
-				c2 = getNextChar(s2, ++l2);
-
-			int lookAheadLocation1 = l1;
-			int lookAheadLocation2 = l2;
-			int currentReturnValue = 0;
-			// find the last digit, setting currentReturnValue as we go if it isn't equal
-			for (QChar lookAhead1 = c1, lookAhead2 = c2;
-				 (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length());
-				 lookAhead1 = getNextChar(s1, ++lookAheadLocation1),
-					   lookAhead2 = getNextChar(s2, ++lookAheadLocation2))
-			{
-				bool is1ADigit = !lookAhead1.isNull() && lookAhead1.isDigit();
-				bool is2ADigit = !lookAhead2.isNull() && lookAhead2.isDigit();
-				if (!is1ADigit && !is2ADigit)
-					break;
-				if (!is1ADigit)
-					return -1;
-				if (!is2ADigit)
-					return 1;
-				if (currentReturnValue == 0)
-				{
-					if (lookAhead1 < lookAhead2)
-					{
-						currentReturnValue = -1;
-					}
-					else if (lookAhead1 > lookAhead2)
-					{
-						currentReturnValue = 1;
-					}
-				}
-			}
-			if (currentReturnValue != 0)
-				return currentReturnValue;
-		}
-		if (cs == Qt::CaseInsensitive)
-		{
-			if (!c1.isLower())
-				c1 = c1.toLower();
-			if (!c2.isLower())
-				c2 = c2.toLower();
-		}
-		int r = QString::localeAwareCompare(c1, c2);
-		if (r < 0)
-			return -1;
-		if (r > 0)
-			return 1;
-	}
-	// The two strings are the same (02 == 2) so fall back to the normal sort
-	return QString::compare(s1, s2, cs);
-}
diff --git a/libraries/logic/MMCStrings.h b/libraries/logic/MMCStrings.h
deleted file mode 100644
index 5606b909..00000000
--- a/libraries/logic/MMCStrings.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <QString>
-
-#include "multimc_logic_export.h"
-
-namespace Strings
-{
-	int MULTIMC_LOGIC_EXPORT naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs);
-}
diff --git a/libraries/logic/MMCZip.cpp b/libraries/logic/MMCZip.cpp
deleted file mode 100644
index 0f35bc70..00000000
--- a/libraries/logic/MMCZip.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-Copyright (C) 2010 Roberto Pompermaier
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-Parts of this file were part of QuaZIP.
-
-QuaZIP is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 2.1 of the License, or
-(at your option) any later version.
-
-QuaZIP is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with QuaZIP.  If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)MMCZip.h files for details. Basically it's the zlib license.
-*/
-
-#include <quazip.h>
-#include <JlCompress.h>
-#include <quazipdir.h>
-#include "MMCZip.h"
-#include "FileSystem.h"
-
-#include <QDebug>
-
-bool copyData(QIODevice &inFile, QIODevice &outFile)
-{
-	while (!inFile.atEnd())
-	{
-		char buf[4096];
-		qint64 readLen = inFile.read(buf, 4096);
-		if (readLen <= 0)
-			return false;
-		if (outFile.write(buf, readLen) != readLen)
-			return false;
-	}
-	return true;
-}
-
-QStringList MMCZip::extractDir(QString fileCompressed, QString dir)
-{
-	return JlCompress::extractDir(fileCompressed, dir);
-}
-
-bool compressFile(QuaZip *zip, QString fileName, QString fileDest)
-{
-	if (!zip)
-	{
-		return false;
-	}
-	if (zip->getMode() != QuaZip::mdCreate && zip->getMode() != QuaZip::mdAppend &&
-		zip->getMode() != QuaZip::mdAdd)
-	{
-		return false;
-	}
-
-	QFile inFile;
-	inFile.setFileName(fileName);
-	if (!inFile.open(QIODevice::ReadOnly))
-	{
-		return false;
-	}
-
-	QuaZipFile outFile(zip);
-	if (!outFile.open(QIODevice::WriteOnly, QuaZipNewInfo(fileDest, inFile.fileName())))
-	{
-		return false;
-	}
-
-	if (!copyData(inFile, outFile) || outFile.getZipError() != UNZ_OK)
-	{
-		return false;
-	}
-
-	outFile.close();
-	if (outFile.getZipError() != UNZ_OK)
-	{
-		return false;
-	}
-	inFile.close();
-
-	return true;
-}
-
-bool MMCZip::compressSubDir(QuaZip* zip, QString dir, QString origDir, QSet<QString>& added,  QString prefix, const SeparatorPrefixTree <'/'> * blacklist)
-{
-	if (!zip) return false;
-	if (zip->getMode()!=QuaZip::mdCreate && zip->getMode()!=QuaZip::mdAppend && zip->getMode()!=QuaZip::mdAdd)
-	{
-		return false;
-	}
-
-	QDir directory(dir);
-	if (!directory.exists())
-	{
-		return false;
-	}
-
-	QDir origDirectory(origDir);
-	if (dir != origDir)
-	{
-		QString internalDirName = origDirectory.relativeFilePath(dir);
-		if(!blacklist || !blacklist->covers(internalDirName))
-		{
-			QuaZipFile dirZipFile(zip);
-			auto dirPrefix = FS::PathCombine(prefix, origDirectory.relativeFilePath(dir)) + "/";
-			if (!dirZipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(dirPrefix, dir), 0, 0, 0))
-			{
-				return false;
-			}
-			dirZipFile.close();
-		}
-	}
-
-	QFileInfoList files = directory.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden);
-	for (auto file: files)
-	{
-		if(!file.isDir())
-		{
-			continue;
-		}
-		if(!compressSubDir(zip,file.absoluteFilePath(),origDir, added, prefix, blacklist))
-		{
-			return false;
-		}
-	}
-
-	files = directory.entryInfoList(QDir::Files);
-	for (auto file: files)
-	{
-		if(!file.isFile())
-		{
-			continue;
-		}
-
-		if(file.absoluteFilePath()==zip->getZipName())
-		{
-			continue;
-		}
-
-		QString filename = origDirectory.relativeFilePath(file.absoluteFilePath());
-		if(blacklist && blacklist->covers(filename))
-		{
-			continue;
-		}
-		if(prefix.size())
-		{
-			filename = FS::PathCombine(prefix, filename);
-		}
-		added.insert(filename);
-		if (!compressFile(zip,file.absoluteFilePath(),filename))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool MMCZip::mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained,
-				   std::function<bool(QString)> filter)
-{
-	QuaZip modZip(from.filePath());
-	modZip.open(QuaZip::mdUnzip);
-
-	QuaZipFile fileInsideMod(&modZip);
-	QuaZipFile zipOutFile(into);
-	for (bool more = modZip.goToFirstFile(); more; more = modZip.goToNextFile())
-	{
-		QString filename = modZip.getCurrentFileName();
-		if (!filter(filename))
-		{
-			qDebug() << "Skipping file " << filename << " from "
-						<< from.fileName() << " - filtered";
-			continue;
-		}
-		if (contained.contains(filename))
-		{
-			qDebug() << "Skipping already contained file " << filename << " from "
-						<< from.fileName();
-			continue;
-		}
-		contained.insert(filename);
-
-		if (!fileInsideMod.open(QIODevice::ReadOnly))
-		{
-			qCritical() << "Failed to open " << filename << " from " << from.fileName();
-			return false;
-		}
-
-		QuaZipNewInfo info_out(fileInsideMod.getActualFileName());
-
-		if (!zipOutFile.open(QIODevice::WriteOnly, info_out))
-		{
-			qCritical() << "Failed to open " << filename << " in the jar";
-			fileInsideMod.close();
-			return false;
-		}
-		if (!copyData(fileInsideMod, zipOutFile))
-		{
-			zipOutFile.close();
-			fileInsideMod.close();
-			qCritical() << "Failed to copy data of " << filename << " into the jar";
-			return false;
-		}
-		zipOutFile.close();
-		fileInsideMod.close();
-	}
-	return true;
-}
-
-bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods)
-{
-	QuaZip zipOut(targetJarPath);
-	if (!zipOut.open(QuaZip::mdCreate))
-	{
-		QFile::remove(targetJarPath);
-		qCritical() << "Failed to open the minecraft.jar for modding";
-		return false;
-	}
-	// Files already added to the jar.
-	// These files will be skipped.
-	QSet<QString> addedFiles;
-
-	// Modify the jar
-	QListIterator<Mod> i(mods);
-    i.toBack();
-    while (i.hasPrevious())
-	{
-		const Mod &mod = i.previous();
-		// do not merge disabled mods.
-		if (!mod.enabled())
-			continue;
-		if (mod.type() == Mod::MOD_ZIPFILE)
-		{
-			if (!mergeZipFiles(&zipOut, mod.filename(), addedFiles, noFilter))
-			{
-				zipOut.close();
-				QFile::remove(targetJarPath);
-				qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
-				return false;
-			}
-		}
-		else if (mod.type() == Mod::MOD_SINGLEFILE)
-		{
-			auto filename = mod.filename();
-			if (!compressFile(&zipOut, filename.absoluteFilePath(),
-										  filename.fileName()))
-			{
-				zipOut.close();
-				QFile::remove(targetJarPath);
-				qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
-				return false;
-			}
-			addedFiles.insert(filename.fileName());
-		}
-		else if (mod.type() == Mod::MOD_FOLDER)
-		{
-			auto filename = mod.filename();
-			QString what_to_zip = filename.absoluteFilePath();
-			QDir dir(what_to_zip);
-			dir.cdUp();
-			QString parent_dir = dir.absolutePath();
-			if (!compressSubDir(&zipOut, what_to_zip, parent_dir, addedFiles))
-			{
-				zipOut.close();
-				QFile::remove(targetJarPath);
-				qCritical() << "Failed to add" << mod.filename().fileName() << "to the jar.";
-				return false;
-			}
-			qDebug() << "Adding folder " << filename.fileName() << " from "
-						<< filename.absoluteFilePath();
-		}
-	}
-
-	if (!mergeZipFiles(&zipOut, QFileInfo(sourceJarPath), addedFiles, metaInfFilter))
-	{
-		zipOut.close();
-		QFile::remove(targetJarPath);
-		qCritical() << "Failed to insert minecraft.jar contents.";
-		return false;
-	}
-
-	// Recompress the jar
-	zipOut.close();
-	if (zipOut.getZipError() != 0)
-	{
-		QFile::remove(targetJarPath);
-		qCritical() << "Failed to finalize minecraft.jar!";
-		return false;
-	}
-	return true;
-}
-
-bool MMCZip::noFilter(QString)
-{
-	return true;
-}
-
-bool MMCZip::metaInfFilter(QString key)
-{
-	if(key.contains("META-INF"))
-	{
-		return false;
-	}
-	return true;
-}
-
-bool MMCZip::compressDir(QString zipFile, QString dir, QString prefix, const SeparatorPrefixTree <'/'> * blacklist)
-{
-	QuaZip zip(zipFile);
-	QDir().mkpath(QFileInfo(zipFile).absolutePath());
-	if(!zip.open(QuaZip::mdCreate))
-	{
-		QFile::remove(zipFile);
-		return false;
-	}
-
-	QSet<QString> added;
-	if (!compressSubDir(&zip, dir, dir, added, prefix, blacklist))
-	{
-		QFile::remove(zipFile);
-		return false;
-	}
-	zip.close();
-	if(zip.getZipError()!=0)
-	{
-		QFile::remove(zipFile);
-		return false;
-	}
-	return true;
-}
-
-QString MMCZip::findFileInZip(QuaZip * zip, const QString & what, const QString &root)
-{
-	QuaZipDir rootDir(zip, root);
-	for(auto fileName: rootDir.entryList(QDir::Files))
-	{
-		if(fileName == what)
-			return root;
-	}
-	for(auto fileName: rootDir.entryList(QDir::Dirs))
-	{
-		QString result = findFileInZip(zip, what, root + fileName);
-		if(!result.isEmpty())
-		{
-			return result;
-		}
-	}
-	return QString();
-}
-
-bool MMCZip::findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root)
-{
-	QuaZipDir rootDir(zip, root);
-	for(auto fileName: rootDir.entryList(QDir::Files))
-	{
-		if(fileName == what)
-		{
-			result.append(root);
-			return true;
-		}
-	}
-	for(auto fileName: rootDir.entryList(QDir::Dirs))
-	{
-		findFilesInZip(zip, what, result, root + fileName);
-	}
-	return !result.isEmpty();
-}
-
-bool removeFile(QStringList listFile)
-{
-	bool ret = true;
-	for (int i = 0; i < listFile.count(); i++)
-	{
-		ret &= QFile::remove(listFile.at(i));
-	}
-	return ret;
-}
-
-bool MMCZip::extractFile(QuaZip *zip, const QString &fileName, const QString &fileDest)
-{
-	if(!zip)
-		return false;
-
-	if (zip->getMode() != QuaZip::mdUnzip)
-		return false;
-
-	if (!fileName.isEmpty())
-		zip->setCurrentFile(fileName);
-
-	QuaZipFile inFile(zip);
-	if (!inFile.open(QIODevice::ReadOnly) || inFile.getZipError() != UNZ_OK)
-		return false;
-
-	// Controllo esistenza cartella file risultato
-	QDir curDir;
-	if (fileDest.endsWith('/'))
-	{
-		if (!curDir.mkpath(fileDest))
-		{
-			return false;
-		}
-	}
-	else
-	{
-		if (!curDir.mkpath(QFileInfo(fileDest).absolutePath()))
-		{
-			return false;
-		}
-	}
-
-	QuaZipFileInfo64 info;
-	if (!zip->getCurrentFileInfo(&info))
-		return false;
-
-	QFile::Permissions srcPerm = info.getPermissions();
-	if (fileDest.endsWith('/') && QFileInfo(fileDest).isDir())
-	{
-		if (srcPerm != 0)
-		{
-			QFile(fileDest).setPermissions(srcPerm);
-		}
-		return true;
-	}
-
-	QFile outFile;
-	outFile.setFileName(fileDest);
-	if (!outFile.open(QIODevice::WriteOnly))
-		return false;
-
-	if (!copyData(inFile, outFile) || inFile.getZipError() != UNZ_OK)
-	{
-		outFile.close();
-		removeFile(QStringList(fileDest));
-		return false;
-	}
-	outFile.close();
-
-	inFile.close();
-	if (inFile.getZipError() != UNZ_OK)
-	{
-		removeFile(QStringList(fileDest));
-		return false;
-	}
-
-	if (srcPerm != 0)
-	{
-		outFile.setPermissions(srcPerm);
-	}
-	return true;
-}
-
-QStringList MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
-{
-	QDir directory(target);
-	QStringList extracted;
-	if (!zip->goToFirstFile())
-	{
-		return QStringList();
-	}
-	do
-	{
-		QString name = zip->getCurrentFileName();
-		if(!name.startsWith(subdir))
-		{
-			continue;
-		}
-		name.remove(0, subdir.size());
-		QString absFilePath = directory.absoluteFilePath(name);
-		if(name.isEmpty())
-		{
-			absFilePath += "/";
-		}
-		if (!extractFile(zip, "", absFilePath))
-		{
-			removeFile(extracted);
-			return QStringList();
-		}
-		extracted.append(absFilePath);
-	} while (zip->goToNextFile());
-	return extracted;
-}
diff --git a/libraries/logic/MMCZip.h b/libraries/logic/MMCZip.h
deleted file mode 100644
index f350e668..00000000
--- a/libraries/logic/MMCZip.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QFileInfo>
-#include <QSet>
-#include "minecraft/Mod.h"
-#include "SeparatorPrefixTree.h"
-#include <functional>
-
-#include "multimc_logic_export.h"
-
-class QuaZip;
-
-namespace MMCZip
-{
-    /**
-	 * Compress a subdirectory.
-	 * \param parentZip Opened zip containing the parent directory.
-	 * \param dir The full path to the directory to pack.
-	 * \param parentDir The full path to the directory corresponding to the root of the ZIP.
-	 * \param recursive Whether to pack sub-directories as well or only files.
-	 * \return true if success, false otherwise.
-     */
-	bool MULTIMC_LOGIC_EXPORT compressSubDir(QuaZip *zip, QString dir, QString origDir, QSet<QString> &added,
-					QString prefix = QString(), const SeparatorPrefixTree <'/'> * blacklist = nullptr);
-
-	/**
-	 * Compress a whole directory.
-	 * \param fileCompressed The name of the archive.
-	 * \param dir The directory to compress.
-	 * \param recursive Whether to pack the subdirectories as well, or just regular files.
-	 * \return true if success, false otherwise.
-	 */
-	bool MULTIMC_LOGIC_EXPORT compressDir(QString zipFile, QString dir, QString prefix = QString(), const SeparatorPrefixTree <'/'> * blacklist = nullptr);
-
-	/// filter function for @mergeZipFiles - passthrough
-	bool MULTIMC_LOGIC_EXPORT noFilter(QString key);
-
-	/// filter function for @mergeZipFiles - ignores METAINF
-	bool MULTIMC_LOGIC_EXPORT metaInfFilter(QString key);
-
-	/**
-	 * Merge two zip files, using a filter function
-	 */
-	bool MULTIMC_LOGIC_EXPORT mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained, std::function<bool(QString)> filter);
-
-	/**
-	 * take a source jar, add mods to it, resulting in target jar
-	 */
-	bool MULTIMC_LOGIC_EXPORT createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods);
-
-	/**
-	 * Extract a whole archive.
-	 *
-	 * \param fileCompressed The name of the archive.
-	 * \param dir The directory to extract to, the current directory if
-	 * left empty.
-	 * \return The list of the full paths of the files extracted, empty on failure.
-	 */
-	QStringList MULTIMC_LOGIC_EXPORT extractDir(QString fileCompressed, QString dir = QString());
-
-	/**
-	 * Find a single file in archive by file name (not path)
-	 *
-	 * \return the path prefix where the file is
-	 */
-	QString MULTIMC_LOGIC_EXPORT findFileInZip(QuaZip * zip, const QString & what, const QString &root = QString());
-
-	/**
-	 * Find a multiple files of the same name in archive by file name
-	 * If a file is found in a path, no deeper paths are searched
-	 *
-	 * \return true if anything was found
-	 */
-	bool MULTIMC_LOGIC_EXPORT findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString());
-
-	/**
-	 * Extract a single file to a destination
-	 *
-	 * \return true if it succeeds
-	 */
-	bool MULTIMC_LOGIC_EXPORT extractFile(QuaZip *zip, const QString &fileName, const QString &fileDest);
-
-	/**
-	 * Extract a subdirectory from an archive
-	 */
-	QStringList MULTIMC_LOGIC_EXPORT extractSubDir(QuaZip *zip, const QString & subdir, const QString &target);
-}
diff --git a/libraries/logic/NullInstance.h b/libraries/logic/NullInstance.h
deleted file mode 100644
index fbb2d985..00000000
--- a/libraries/logic/NullInstance.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-#include "BaseInstance.h"
-
-class NullInstance: public BaseInstance
-{
-public:
-	NullInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir)
-	:BaseInstance(globalSettings, settings, rootDir)
-	{
-		setFlag(BaseInstance::VersionBrokenFlag);
-	}
-	virtual ~NullInstance() {};
-	virtual bool setIntendedVersionId(QString) override
-	{
-		return false;
-	}
-	virtual void cleanupAfterRun() override
-	{
-	}
-	virtual QString currentVersionId() const override
-	{
-		return "Null";
-	};
-	virtual QString intendedVersionId() const override
-	{
-		return "Null";
-	};
-	virtual void init() override
-	{
-	};
-	virtual QString getStatusbarDescription() override
-	{
-		return tr("Unknown instance type");
-	};
-	virtual bool shouldUpdate() const override
-	{
-		return false;
-	};
-	virtual QSet< QString > traits() override
-	{
-		return {};
-	};
-	virtual QString instanceConfigFolder() const override
-	{
-		return instanceRoot();
-	};
-	virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr) override
-	{
-		return nullptr;
-	}
-	virtual std::shared_ptr< Task > createUpdateTask() override
-	{
-		return nullptr;
-	}
-	virtual std::shared_ptr<Task> createJarModdingTask() override
-	{
-		return nullptr;
-	}
-	virtual void setShouldUpdate(bool) override
-	{
-	};
-	virtual std::shared_ptr< BaseVersionList > versionList() const override
-	{
-		return nullptr;
-	};
-	virtual QProcessEnvironment createEnvironment() override
-	{
-		return QProcessEnvironment();
-	}
-	virtual QMap<QString, QString> getVariables() const override
-	{
-		return QMap<QString, QString>();
-	}
-	virtual IPathMatcher::Ptr getLogFileMatcher() override
-	{
-		return nullptr;
-	}
-	virtual QString getLogFileRoot() override
-	{
-		return instanceRoot();
-	}
-	virtual QString typeName() const override
-	{
-		return "Null";
-	}
-	bool canExport() const override
-	{
-		return false;
-	}
-};
diff --git a/libraries/logic/QObjectPtr.h b/libraries/logic/QObjectPtr.h
deleted file mode 100644
index b81b3234..00000000
--- a/libraries/logic/QObjectPtr.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <QObject>
-
-namespace details
-{
-struct DeleteQObjectLater
-{
-	void operator()(QObject *obj) const
-	{
-		obj->deleteLater();
-	}
-};
-}
-/**
- * A unique pointer class with unique pointer semantics intended for derivates of QObject
- * Calls deleteLater() instead of destroying the contained object immediately
- */
-template<typename T> using unique_qobject_ptr = std::unique_ptr<T, details::DeleteQObjectLater>;
-
-/**
- * A shared pointer class with shared pointer semantics intended for derivates of QObject
- * Calls deleteLater() instead of destroying the contained object immediately
- */
-template <typename T>
-class shared_qobject_ptr
-{
-public:
-	shared_qobject_ptr(){}
-	shared_qobject_ptr(T * wrap)
-	{
-		reset(wrap);
-	}
-	shared_qobject_ptr(const shared_qobject_ptr<T>& other)
-	{
-		m_ptr = other.m_ptr;
-	}
-	template<typename Derived>
-	shared_qobject_ptr(const shared_qobject_ptr<Derived> &other)
-	{
-		m_ptr = other.unwrap();
-	}
-
-public:
-	void reset(T * wrap)
-	{
-		using namespace std::placeholders;
-		m_ptr.reset(wrap, std::bind(&QObject::deleteLater, _1));
-	}
-	void reset()
-	{
-		m_ptr.reset();
-	}
-	T * get() const
-	{
-		return m_ptr.get();
-	}
-	T * operator->() const
-	{
-		return m_ptr.get();
-	}
-	T & operator*() const
-	{
-		return *m_ptr.get();
-	}
-	operator bool() const
-	{
-		return m_ptr.get() != nullptr;
-	}
-	const std::shared_ptr <T> unwrap() const
-	{
-		return m_ptr;
-	}
-
-private:
-	std::shared_ptr <T> m_ptr;
-};
diff --git a/libraries/logic/RWStorage.h b/libraries/logic/RWStorage.h
deleted file mode 100644
index b1598ca4..00000000
--- a/libraries/logic/RWStorage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-template <typename K, typename V>
-class RWStorage
-{
-public:
-	void add(K key, V value)
-	{
-		QWriteLocker l(&lock);
-		cache[key] = value;
-		stale_entries.remove(key);
-	}
-	V get(K key)
-	{
-		QReadLocker l(&lock);
-		if(cache.contains(key))
-		{
-			return cache[key];
-		}
-		else return V();
-	}
-	bool get(K key, V& value)
-	{
-		QReadLocker l(&lock);
-		if(cache.contains(key))
-		{
-			value = cache[key];
-			return true;
-		}
-		else return false;
-	}
-	bool has(K key)
-	{
-		QReadLocker l(&lock);
-		return cache.contains(key);
-	}
-	bool stale(K key)
-	{
-		QReadLocker l(&lock);
-		if(!cache.contains(key))
-			return true;
-		return stale_entries.contains(key);
-	}
-	void setStale(K key)
-	{
-		QReadLocker l(&lock);
-		if(cache.contains(key))
-		{
-			stale_entries.insert(key);
-		}
-	}
-	void clear()
-	{
-		QWriteLocker l(&lock);
-		cache.clear();
-	}
-private:
-	QReadWriteLock lock;
-	QMap<K, V> cache;
-	QSet<K> stale_entries;
-};
\ No newline at end of file
diff --git a/libraries/logic/RecursiveFileSystemWatcher.cpp b/libraries/logic/RecursiveFileSystemWatcher.cpp
deleted file mode 100644
index 59c3f0f0..00000000
--- a/libraries/logic/RecursiveFileSystemWatcher.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "RecursiveFileSystemWatcher.h"
-
-#include <QRegularExpression>
-#include <QDebug>
-
-RecursiveFileSystemWatcher::RecursiveFileSystemWatcher(QObject *parent)
-	: QObject(parent), m_watcher(new QFileSystemWatcher(this))
-{
-	connect(m_watcher, &QFileSystemWatcher::fileChanged, this,
-			&RecursiveFileSystemWatcher::fileChange);
-	connect(m_watcher, &QFileSystemWatcher::directoryChanged, this,
-			&RecursiveFileSystemWatcher::directoryChange);
-}
-
-void RecursiveFileSystemWatcher::setRootDir(const QDir &root)
-{
-	bool wasEnabled = m_isEnabled;
-	disable();
-	m_root = root;
-	setFiles(scanRecursive(m_root));
-	if (wasEnabled)
-	{
-		enable();
-	}
-}
-void RecursiveFileSystemWatcher::setWatchFiles(const bool watchFiles)
-{
-	bool wasEnabled = m_isEnabled;
-	disable();
-	m_watchFiles = watchFiles;
-	if (wasEnabled)
-	{
-		enable();
-	}
-}
-
-void RecursiveFileSystemWatcher::enable()
-{
-	if (m_isEnabled)
-	{
-		return;
-	}
-	Q_ASSERT(m_root != QDir::root());
-	addFilesToWatcherRecursive(m_root);
-	m_isEnabled = true;
-}
-void RecursiveFileSystemWatcher::disable()
-{
-	if (!m_isEnabled)
-	{
-		return;
-	}
-	m_isEnabled = false;
-	m_watcher->removePaths(m_watcher->files());
-	m_watcher->removePaths(m_watcher->directories());
-}
-
-void RecursiveFileSystemWatcher::setFiles(const QStringList &files)
-{
-	if (files != m_files)
-	{
-		m_files = files;
-		emit filesChanged();
-	}
-}
-
-void RecursiveFileSystemWatcher::addFilesToWatcherRecursive(const QDir &dir)
-{
-	m_watcher->addPath(dir.absolutePath());
-	for (const QString &directory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
-	{
-		addFilesToWatcherRecursive(dir.absoluteFilePath(directory));
-	}
-	if (m_watchFiles)
-	{
-		for (const QFileInfo &info : dir.entryInfoList(QDir::Files))
-		{
-			m_watcher->addPath(info.absoluteFilePath());
-		}
-	}
-}
-QStringList RecursiveFileSystemWatcher::scanRecursive(const QDir &directory)
-{
-	QStringList ret;
-	if(!m_matcher)
-	{
-		return {};
-	}
-	for (const QString &dir : directory.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden))
-	{
-		ret.append(scanRecursive(directory.absoluteFilePath(dir)));
-	}
-	for (const QString &file : directory.entryList(QDir::Files | QDir::Hidden))
-	{
-		auto relPath = m_root.relativeFilePath(directory.absoluteFilePath(file));
-		if (m_matcher->matches(relPath))
-		{
-			ret.append(relPath);
-		}
-	}
-	return ret;
-}
-
-void RecursiveFileSystemWatcher::fileChange(const QString &path)
-{
-	emit fileChanged(path);
-}
-void RecursiveFileSystemWatcher::directoryChange(const QString &path)
-{
-	setFiles(scanRecursive(m_root));
-}
diff --git a/libraries/logic/RecursiveFileSystemWatcher.h b/libraries/logic/RecursiveFileSystemWatcher.h
deleted file mode 100644
index 07bce0b9..00000000
--- a/libraries/logic/RecursiveFileSystemWatcher.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <QFileSystemWatcher>
-#include <QDir>
-#include "pathmatcher/IPathMatcher.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT RecursiveFileSystemWatcher : public QObject
-{
-	Q_OBJECT
-public:
-	RecursiveFileSystemWatcher(QObject *parent);
-
-	void setRootDir(const QDir &root);
-	QDir rootDir() const
-	{
-		return m_root;
-	}
-
-	// WARNING: setting this to true may be bad for performance
-	void setWatchFiles(const bool watchFiles);
-	bool watchFiles() const
-	{
-		return m_watchFiles;
-	}
-
-	void setMatcher(IPathMatcher::Ptr matcher)
-	{
-		m_matcher = matcher;
-	}
-
-	QStringList files() const
-	{
-		return m_files;
-	}
-
-signals:
-	void filesChanged();
-	void fileChanged(const QString &path);
-
-public slots:
-	void enable();
-	void disable();
-
-private:
-	QDir m_root;
-	bool m_watchFiles = false;
-	bool m_isEnabled = false;
-	IPathMatcher::Ptr m_matcher;
-
-	QFileSystemWatcher *m_watcher;
-
-	QStringList m_files;
-	void setFiles(const QStringList &files);
-
-	void addFilesToWatcherRecursive(const QDir &dir);
-	QStringList scanRecursive(const QDir &dir);
-
-private slots:
-	void fileChange(const QString &path);
-	void directoryChange(const QString &path);
-};
diff --git a/libraries/logic/SeparatorPrefixTree.h b/libraries/logic/SeparatorPrefixTree.h
deleted file mode 100644
index fd149af0..00000000
--- a/libraries/logic/SeparatorPrefixTree.h
+++ /dev/null
@@ -1,298 +0,0 @@
-#pragma once
-#include <QString>
-#include <QMap>
-#include <QStringList>
-
-template <char Tseparator>
-class SeparatorPrefixTree
-{
-public:
-	SeparatorPrefixTree(QStringList paths)
-	{
-		insert(paths);
-	}
-
-	SeparatorPrefixTree(bool contained = false)
-	{
-		m_contained = contained;
-	}
-
-	void insert(QStringList paths)
-	{
-		for(auto &path: paths)
-		{
-			insert(path);
-		}
-	}
-
-	/// insert an exact path into the tree
-	SeparatorPrefixTree & insert(QString path)
-	{
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			children[path] = SeparatorPrefixTree(true);
-			return children[path];
-		}
-		else
-		{
-			auto prefix = path.left(sepIndex);
-			if(!children.contains(prefix))
-			{
-				children[prefix] = SeparatorPrefixTree(false);
-			}
-			return children[prefix].insert(path.mid(sepIndex + 1));
-		}
-	}
-
-	/// is the path fully contained in the tree?
-	bool contains(QString path) const
-	{
-		auto node = find(path);
-		return node != nullptr;
-	}
-
-	/// does the tree cover a path? That means the prefix of the path is contained in the tree
-	bool covers(QString path) const
-	{
-		// if we found some valid node, it's good enough. the tree covers the path
-		if(m_contained)
-		{
-			return true;
-		}
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			auto found = children.find(path);
-			if(found == children.end())
-			{
-				return false;
-			}
-			return (*found).covers(QString());
-		}
-		else
-		{
-			auto prefix = path.left(sepIndex);
-			auto found = children.find(prefix);
-			if(found == children.end())
-			{
-				return false;
-			}
-			return (*found).covers(path.mid(sepIndex + 1));
-		}
-	}
-
-	/// return the contained path that covers the path specified
-	QString cover(QString path) const
-	{
-		// if we found some valid node, it's good enough. the tree covers the path
-		if(m_contained)
-		{
-			return QString("");
-		}
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			auto found = children.find(path);
-			if(found == children.end())
-			{
-				return QString();
-			}
-			auto nested = (*found).cover(QString());
-			if(nested.isNull())
-			{
-				return nested;
-			}
-			if(nested.isEmpty())
-				return path;
-			return path + Tseparator + nested;
-		}
-		else
-		{
-			auto prefix = path.left(sepIndex);
-			auto found = children.find(prefix);
-			if(found == children.end())
-			{
-				return QString();
-			}
-			auto nested = (*found).cover(path.mid(sepIndex + 1));
-			if(nested.isNull())
-			{
-				return nested;
-			}
-			if(nested.isEmpty())
-				return prefix;
-			return prefix + Tseparator + nested;
-		}
-	}
-
-	/// Does the path-specified node exist in the tree? It does not have to be contained.
-	bool exists(QString path) const
-	{
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			auto found = children.find(path);
-			if(found == children.end())
-			{
-				return false;
-			}
-			return true;
-		}
-		else
-		{
-			auto prefix = path.left(sepIndex);
-			auto found = children.find(prefix);
-			if(found == children.end())
-			{
-				return false;
-			}
-			return (*found).exists(path.mid(sepIndex + 1));
-		}
-	}
-
-	/// find a node in the tree by name
-	const SeparatorPrefixTree * find(QString path) const
-	{
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			auto found = children.find(path);
-			if(found == children.end())
-			{
-				return nullptr;
-			}
-			return &(*found);
-		}
-		else
-		{
-			auto prefix = path.left(sepIndex);
-			auto found = children.find(prefix);
-			if(found == children.end())
-			{
-				return nullptr;
-			}
-			return (*found).find(path.mid(sepIndex + 1));
-		}
-	}
-
-	/// is this a leaf node?
-	bool leaf() const
-	{
-		return children.isEmpty();
-	}
-
-	/// is this node actually contained in the tree, or is it purely structural?
-	bool contained() const
-	{
-		return m_contained;
-	}
-
-	/// Remove a path from the tree
-	bool remove(QString path)
-	{
-		return removeInternal(path) != Failed;
-	}
-
-	/// Clear all children of this node tree node
-	void clear()
-	{
-		children.clear();
-	}
-
-	QStringList toStringList() const
-	{
-		QStringList collected;
-		// collecting these is more expensive.
-		auto iter = children.begin();
-		while(iter != children.end())
-		{
-			QStringList list = iter.value().toStringList();
-			for(int i = 0; i < list.size(); i++)
-			{
-				list[i] = iter.key() + Tseparator + list[i];
-			}
-			collected.append(list);
-			if((*iter).m_contained)
-			{
-				collected.append(iter.key());
-			}
-			iter++;
-		}
-		return collected;
-	}
-private:
-	enum Removal
-	{
-		Failed,
-		Succeeded,
-		HasChildren
-	};
-	Removal removeInternal(QString path = QString())
-	{
-		if(path.isEmpty())
-		{
-			if(!m_contained)
-			{
-				// remove all children - we are removing a prefix
-				clear();
-				return Succeeded;
-			}
-			m_contained = false;
-			if(children.size())
-			{
-				return HasChildren;
-			}
-			return Succeeded;
-		}
-		Removal remStatus = Failed;
-		QString childToRemove;
-		auto sepIndex = path.indexOf(Tseparator);
-		if(sepIndex == -1)
-		{
-			childToRemove = path;
-			auto found = children.find(childToRemove);
-			if(found == children.end())
-			{
-				return Failed;
-			}
-			remStatus = (*found).removeInternal();
-		}
-		else
-		{
-			childToRemove = path.left(sepIndex);
-			auto found = children.find(childToRemove);
-			if(found == children.end())
-			{
-				return Failed;
-			}
-			remStatus = (*found).removeInternal(path.mid(sepIndex + 1));
-		}
-		switch (remStatus)
-		{
-			case Failed:
-			case HasChildren:
-			{
-				return remStatus;
-			}
-			case Succeeded:
-			{
-				children.remove(childToRemove);
-				if(m_contained)
-				{
-					return HasChildren;
-				}
-				if(children.size())
-				{
-					return HasChildren;
-				}
-				return Succeeded;
-			}
-		}
-		return Failed;
-	}
-
-private:
-	QMap<QString,SeparatorPrefixTree<Tseparator>> children;
-	bool m_contained = false;
-};
diff --git a/libraries/logic/TypeMagic.h b/libraries/logic/TypeMagic.h
deleted file mode 100644
index fa9d12a9..00000000
--- a/libraries/logic/TypeMagic.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-namespace TypeMagic
-{
-/** "Cleans" the given type T by stripping references (&) and cv-qualifiers (const, volatile) from it
- * const int => int
- * QString & => QString
- * const unsigned long long & => unsigned long long
- *
- * Usage:
- *   using Cleaned = Detail::CleanType<const int>;
- *   static_assert(std::is_same<Cleaned, int>, "Cleaned == int");
- */
-// the order of remove_cv and remove_reference matters!
-template <typename T>
-using CleanType = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-/// For functors (structs with operator()), including lambdas, which in **most** cases are functors
-/// "Calls" Function<Ret(*)(Arg)> or Function<Ret(C::*)(Arg)>
-template <typename T> struct Function : public Function<decltype(&T::operator())> {};
-/// For function pointers (&function), including static members (&Class::member)
-template <typename Ret, typename Arg> struct Function<Ret(*)(Arg)> : public Function<Ret(Arg)> {};
-/// Default specialization used by others.
-template <typename Ret, typename Arg> struct Function<Ret(Arg)>
-{
-	using ReturnType = Ret;
-	using Argument = Arg;
-};
-/// For member functions. Also used by the lambda overload if the lambda captures [this]
-template <class C, typename Ret, typename Arg> struct Function<Ret(C::*)(Arg)> : public Function<Ret(Arg)> {};
-template <class C, typename Ret, typename Arg> struct Function<Ret(C::*)(Arg) const> : public Function<Ret(Arg)> {};
-/// Overload for references
-template <typename F> struct Function<F&> : public Function<F> {};
-/// Overload for rvalues
-template <typename F> struct Function<F&&> : public Function<F> {};
-// for more info: https://functionalcpp.wordpress.com/2013/08/05/function-traits/
-}
diff --git a/libraries/logic/Version.cpp b/libraries/logic/Version.cpp
deleted file mode 100644
index 3c4727ad..00000000
--- a/libraries/logic/Version.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "Version.h"
-
-#include <QStringList>
-#include <QUrl>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-
-Version::Version(const QString &str) : m_string(str)
-{
-	parse();
-}
-
-bool Version::operator<(const Version &other) const
-{
-	const int size = qMax(m_sections.size(), other.m_sections.size());
-	for (int i = 0; i < size; ++i)
-	{
-		const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
-		const Section sec2 =
-			(i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
-		if (sec1 != sec2)
-		{
-			return sec1 < sec2;
-		}
-	}
-
-	return false;
-}
-bool Version::operator<=(const Version &other) const
-{
-	return *this < other || *this == other;
-}
-bool Version::operator>(const Version &other) const
-{
-	const int size = qMax(m_sections.size(), other.m_sections.size());
-	for (int i = 0; i < size; ++i)
-	{
-		const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
-		const Section sec2 =
-			(i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
-		if (sec1 != sec2)
-		{
-			return sec1 > sec2;
-		}
-	}
-
-	return false;
-}
-bool Version::operator>=(const Version &other) const
-{
-	return *this > other || *this == other;
-}
-bool Version::operator==(const Version &other) const
-{
-	const int size = qMax(m_sections.size(), other.m_sections.size());
-	for (int i = 0; i < size; ++i)
-	{
-		const Section sec1 = (i >= m_sections.size()) ? Section("0") : m_sections.at(i);
-		const Section sec2 =
-			(i >= other.m_sections.size()) ? Section("0") : other.m_sections.at(i);
-		if (sec1 != sec2)
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-bool Version::operator!=(const Version &other) const
-{
-	return !operator==(other);
-}
-
-void Version::parse()
-{
-	m_sections.clear();
-
-	QStringList parts = m_string.split('.');
-
-	for (const auto part : parts)
-	{
-		m_sections.append(Section(part));
-	}
-}
-
-bool versionIsInInterval(const QString &version, const QString &interval)
-{
-	return versionIsInInterval(Version(version), interval);
-}
-bool versionIsInInterval(const Version &version, const QString &interval)
-{
-	if (interval.isEmpty() || version.toString() == interval)
-	{
-		return true;
-	}
-
-	// Interval notation is used
-	QRegularExpression exp(
-		"(?<start>[\\[\\]\\(\\)])(?<bottom>.*?)(,(?<top>.*?))?(?<end>[\\[\\]\\(\\)]),?");
-	QRegularExpressionMatch match = exp.match(interval);
-	if (match.hasMatch())
-	{
-		const QChar start = match.captured("start").at(0);
-		const QChar end = match.captured("end").at(0);
-		const QString bottom = match.captured("bottom");
-		const QString top = match.captured("top");
-
-		// check if in range (bottom)
-		if (!bottom.isEmpty())
-		{
-			const auto bottomVersion = Version(bottom);
-			if ((start == '[') && !(version >= bottomVersion))
-			{
-				return false;
-			}
-			else if ((start == '(') && !(version > bottomVersion))
-			{
-				return false;
-			}
-		}
-
-		// check if in range (top)
-		if (!top.isEmpty())
-		{
-			const auto topVersion = Version(top);
-			if ((end == ']') && !(version <= topVersion))
-			{
-				return false;
-			}
-			else if ((end == ')') && !(version < topVersion))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
diff --git a/libraries/logic/Version.h b/libraries/logic/Version.h
deleted file mode 100644
index b5946ced..00000000
--- a/libraries/logic/Version.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QList>
-
-#include "multimc_logic_export.h"
-
-class QUrl;
-
-struct MULTIMC_LOGIC_EXPORT Version
-{
-	Version(const QString &str);
-	Version() {}
-
-	bool operator<(const Version &other) const;
-	bool operator<=(const Version &other) const;
-	bool operator>(const Version &other) const;
-	bool operator>=(const Version &other) const;
-	bool operator==(const Version &other) const;
-	bool operator!=(const Version &other) const;
-
-	QString toString() const
-	{
-		return m_string;
-	}
-
-private:
-	QString m_string;
-	struct Section
-	{
-		explicit Section(const QString &fullString)
-		{
-			m_fullString = fullString;
-			int cutoff = m_fullString.size();
-			for(int i = 0; i < m_fullString.size(); i++)
-			{
-				if(!m_fullString[i].isDigit())
-				{
-					cutoff = i;
-					break;
-				}
-			}
-			auto numPart = m_fullString.leftRef(cutoff);
-			if(numPart.size())
-			{
-				numValid = true;
-				m_numPart = numPart.toInt();
-			}
-			auto stringPart = m_fullString.midRef(cutoff);
-			if(stringPart.size())
-			{
-				m_stringPart = stringPart.toString();
-			}
-		}
-		explicit Section() {}
-		bool numValid = false;
-		int m_numPart = 0;
-		QString m_stringPart;
-		QString m_fullString;
-
-		inline bool operator!=(const Section &other) const
-		{
-			if(numValid && other.numValid)
-			{
-				return m_numPart != other.m_numPart || m_stringPart != other.m_stringPart;
-			}
-			else
-			{
-				return m_fullString != other.m_fullString;
-			}
-		}
-		inline bool operator<(const Section &other) const
-		{
-			if(numValid && other.numValid)
-			{
-				if(m_numPart < other.m_numPart)
-					return true;
-				if(m_numPart == other.m_numPart && m_stringPart < other.m_stringPart)
-					return true;
-				return false;
-			}
-			else
-			{
-				return m_fullString < other.m_fullString;
-			}
-		}
-		inline bool operator>(const Section &other) const
-		{
-			if(numValid && other.numValid)
-			{
-				if(m_numPart > other.m_numPart)
-					return true;
-				if(m_numPart == other.m_numPart && m_stringPart > other.m_stringPart)
-					return true;
-				return false;
-			}
-			else
-			{
-				return m_fullString > other.m_fullString;
-			}
-		}
-	};
-	QList<Section> m_sections;
-
-	void parse();
-};
-
-MULTIMC_LOGIC_EXPORT bool versionIsInInterval(const QString &version, const QString &interval);
-MULTIMC_LOGIC_EXPORT bool versionIsInInterval(const Version &version, const QString &interval);
-
diff --git a/libraries/logic/java/JavaChecker.cpp b/libraries/logic/java/JavaChecker.cpp
deleted file mode 100644
index 54d552a9..00000000
--- a/libraries/logic/java/JavaChecker.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-#include "JavaChecker.h"
-#include <FileSystem.h>
-#include <Commandline.h>
-#include <QFile>
-#include <QProcess>
-#include <QMap>
-#include <QCoreApplication>
-#include <QDebug>
-
-JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
-{
-}
-
-void JavaChecker::performCheck()
-{
-	QString checkerJar = FS::PathCombine(QCoreApplication::applicationDirPath(), "jars", "JavaCheck.jar");
-
-	QStringList args;
-
-	process.reset(new QProcess());
-	if(m_args.size())
-	{
-		auto extraArgs = Commandline::splitArgs(m_args);
-		args.append(extraArgs);
-	}
-	if(m_minMem != 0)
-	{
-		args << QString("-Xms%1m").arg(m_minMem);
-	}
-	if(m_maxMem != 0)
-	{
-		args << QString("-Xmx%1m").arg(m_maxMem);
-	}
-	if(m_permGen != 64)
-	{
-		args << QString("-XX:PermSize=%1m").arg(m_permGen);
-	}
-
-	args.append({"-jar", checkerJar});
-	process->setArguments(args);
-	process->setProgram(m_path);
-	process->setProcessChannelMode(QProcess::SeparateChannels);
-	qDebug() << "Running java checker: " + m_path + args.join(" ");;
-
-	connect(process.get(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus)));
-	connect(process.get(), SIGNAL(error(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
-	connect(process.get(), SIGNAL(readyReadStandardOutput()), this, SLOT(stdoutReady()));
-	connect(process.get(), SIGNAL(readyReadStandardError()), this, SLOT(stderrReady()));
-	connect(&killTimer, SIGNAL(timeout()), SLOT(timeout()));
-	killTimer.setSingleShot(true);
-	killTimer.start(15000);
-	process->start();
-}
-
-void JavaChecker::stdoutReady()
-{
-	QByteArray data = process->readAllStandardOutput();
-	QString added = QString::fromLocal8Bit(data);
-	added.remove('\r');
-	m_stdout += added;
-}
-
-void JavaChecker::stderrReady()
-{
-	QByteArray data = process->readAllStandardError();
-	QString added = QString::fromLocal8Bit(data);
-	added.remove('\r');
-	m_stderr += added;
-}
-
-void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
-{
-	killTimer.stop();
-	QProcessPtr _process;
-	_process.swap(process);
-
-	JavaCheckResult result;
-	{
-		result.path = m_path;
-		result.id = m_id;
-	}
-	result.errorLog = m_stderr;
-	qDebug() << "STDOUT" << m_stdout;
-	qWarning() << "STDERR" << m_stderr;
-	qDebug() << "Java checker finished with status " << status << " exit code " << exitcode;
-
-	if (status == QProcess::CrashExit || exitcode == 1)
-	{
-		qDebug() << "Java checker failed!";
-		emit checkFinished(result);
-		return;
-	}
-
-	bool success = true;
-
-	QMap<QString, QString> results;
-	QStringList lines = m_stdout.split("\n", QString::SkipEmptyParts);
-	for(QString line : lines)
-	{
-		line = line.trimmed();
-
-		auto parts = line.split('=', QString::SkipEmptyParts);
-		if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty())
-		{
-			success = false;
-		}
-		else
-		{
-			results.insert(parts[0], parts[1]);
-		}
-	}
-
-	if(!results.contains("os.arch") || !results.contains("java.version") || !success)
-	{
-		qDebug() << "Java checker failed - couldn't extract required information.";
-		emit checkFinished(result);
-		return;
-	}
-
-	auto os_arch = results["os.arch"];
-	auto java_version = results["java.version"];
-	bool is_64 = os_arch == "x86_64" || os_arch == "amd64";
-
-
-	result.valid = true;
-	result.is_64bit = is_64;
-	result.mojangPlatform = is_64 ? "64" : "32";
-	result.realPlatform = os_arch;
-	result.javaVersion = java_version;
-	qDebug() << "Java checker succeeded.";
-	emit checkFinished(result);
-}
-
-void JavaChecker::error(QProcess::ProcessError err)
-{
-	if(err == QProcess::FailedToStart)
-	{
-		killTimer.stop();
-		qDebug() << "Java checker has failed to start.";
-		JavaCheckResult result;
-		{
-			result.path = m_path;
-			result.id = m_id;
-		}
-
-		emit checkFinished(result);
-		return;
-	}
-}
-
-void JavaChecker::timeout()
-{
-	// NO MERCY. NO ABUSE.
-	if(process)
-	{
-		qDebug() << "Java checker has been killed by timeout.";
-		process->kill();
-	}
-}
diff --git a/libraries/logic/java/JavaChecker.h b/libraries/logic/java/JavaChecker.h
deleted file mode 100644
index 650e7ce3..00000000
--- a/libraries/logic/java/JavaChecker.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-#include <QProcess>
-#include <QTimer>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-#include "JavaVersion.h"
-
-class JavaChecker;
-
-struct MULTIMC_LOGIC_EXPORT JavaCheckResult
-{
-	QString path;
-	QString mojangPlatform;
-	QString realPlatform;
-	JavaVersion javaVersion;
-	QString errorLog;
-	bool valid = false;
-	bool is_64bit = false;
-	int id;
-};
-
-typedef std::shared_ptr<QProcess> QProcessPtr;
-typedef std::shared_ptr<JavaChecker> JavaCheckerPtr;
-class MULTIMC_LOGIC_EXPORT JavaChecker : public QObject
-{
-	Q_OBJECT
-public:
-	explicit JavaChecker(QObject *parent = 0);
-	void performCheck();
-
-	QString m_path;
-	QString m_args;
-	int m_id = 0;
-	int m_minMem = 0;
-	int m_maxMem = 0;
-	int m_permGen = 64;
-
-signals:
-	void checkFinished(JavaCheckResult result);
-private:
-	QProcessPtr process;
-	QTimer killTimer;
-	QString m_stdout;
-	QString m_stderr;
-public
-slots:
-	void timeout();
-	void finished(int exitcode, QProcess::ExitStatus);
-	void error(QProcess::ProcessError);
-	void stdoutReady();
-	void stderrReady();
-};
diff --git a/libraries/logic/java/JavaCheckerJob.cpp b/libraries/logic/java/JavaCheckerJob.cpp
deleted file mode 100644
index 0b040e43..00000000
--- a/libraries/logic/java/JavaCheckerJob.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "JavaCheckerJob.h"
-
-#include <QDebug>
-
-void JavaCheckerJob::partFinished(JavaCheckResult result)
-{
-	num_finished++;
-	qDebug() << m_job_name.toLocal8Bit() << "progress:" << num_finished << "/"
-				<< javacheckers.size();
-	emit progress(num_finished, javacheckers.size());
-
-	javaresults.replace(result.id, result);
-
-	if (num_finished == javacheckers.size())
-	{
-		emit finished(javaresults);
-	}
-}
-
-void JavaCheckerJob::executeTask()
-{
-	qDebug() << m_job_name.toLocal8Bit() << " started.";
-	m_running = true;
-	for (auto iter : javacheckers)
-	{
-		javaresults.append(JavaCheckResult());
-		connect(iter.get(), SIGNAL(checkFinished(JavaCheckResult)), SLOT(partFinished(JavaCheckResult)));
-		iter->performCheck();
-	}
-}
diff --git a/libraries/logic/java/JavaCheckerJob.h b/libraries/logic/java/JavaCheckerJob.h
deleted file mode 100644
index aca0d02e..00000000
--- a/libraries/logic/java/JavaCheckerJob.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QtNetwork>
-#include "JavaChecker.h"
-#include "tasks/Task.h"
-
-class JavaCheckerJob;
-typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr;
-
-class JavaCheckerJob : public Task
-{
-	Q_OBJECT
-public:
-	explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
-
-	bool addJavaCheckerAction(JavaCheckerPtr base)
-	{
-		javacheckers.append(base);
-		total_progress++;
-		// if this is already running, the action needs to be started right away!
-		if (isRunning())
-		{
-			setProgress(current_progress, total_progress);
-			connect(base.get(), SIGNAL(checkFinished(JavaCheckResult)), SLOT(partFinished(JavaCheckResult)));
-
-			base->performCheck();
-		}
-		return true;
-	}
-
-	JavaCheckerPtr operator[](int index)
-	{
-		return javacheckers[index];
-	}
-	;
-	JavaCheckerPtr first()
-	{
-		if (javacheckers.size())
-			return javacheckers[0];
-		return JavaCheckerPtr();
-	}
-	int size() const
-	{
-		return javacheckers.size();
-	}
-	virtual bool isRunning() const override
-	{
-		return m_running;
-	}
-
-signals:
-	void started();
-	void finished(QList<JavaCheckResult>);
-
-private slots:
-	void partFinished(JavaCheckResult result);
-
-protected:
-	virtual void executeTask() override;
-
-private:
-	QString m_job_name;
-	QList<JavaCheckerPtr> javacheckers;
-	QList<JavaCheckResult> javaresults;
-	qint64 current_progress = 0;
-	qint64 total_progress = 0;
-	int num_finished = 0;
-	bool m_running = false;
-};
diff --git a/libraries/logic/java/JavaInstall.cpp b/libraries/logic/java/JavaInstall.cpp
deleted file mode 100644
index bb262b6e..00000000
--- a/libraries/logic/java/JavaInstall.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "JavaInstall.h"
-#include <MMCStrings.h>
-
-bool JavaInstall::operator<(const JavaInstall &rhs)
-{
-	auto archCompare = Strings::naturalCompare(arch, rhs.arch, Qt::CaseInsensitive);
-	if(archCompare != 0)
-		return archCompare < 0;
-	if(id < rhs.id)
-	{
-		return true;
-	}
-	if(id > rhs.id)
-	{
-		return false;
-	}
-	return Strings::naturalCompare(path, rhs.path, Qt::CaseInsensitive) < 0;
-}
-
-bool JavaInstall::operator==(const JavaInstall &rhs)
-{
-	return arch == rhs.arch && id == rhs.id && path == rhs.path;
-}
-
-bool JavaInstall::operator>(const JavaInstall &rhs)
-{
-	return (!operator<(rhs)) && (!operator==(rhs));
-}
diff --git a/libraries/logic/java/JavaInstall.h b/libraries/logic/java/JavaInstall.h
deleted file mode 100644
index 882c7386..00000000
--- a/libraries/logic/java/JavaInstall.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "BaseVersion.h"
-#include "JavaVersion.h"
-
-struct JavaInstall : public BaseVersion
-{
-	JavaInstall(){}
-	JavaInstall(QString id, QString arch, QString path)
-	: id(id), arch(arch), path(path)
-	{
-	}
-	virtual QString descriptor()
-	{
-		return id.toString();
-	}
-
-	virtual QString name()
-	{
-		return id.toString();
-	}
-
-	virtual QString typeString() const
-	{
-		return arch;
-	}
-
-	bool operator<(const JavaInstall & rhs);
-	bool operator==(const JavaInstall & rhs);
-	bool operator>(const JavaInstall & rhs);
-
-	JavaVersion id;
-	QString arch;
-	QString path;
-	bool recommended = false;
-};
-
-typedef std::shared_ptr<JavaInstall> JavaInstallPtr;
diff --git a/libraries/logic/java/JavaInstallList.cpp b/libraries/logic/java/JavaInstallList.cpp
deleted file mode 100644
index c0729227..00000000
--- a/libraries/logic/java/JavaInstallList.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtNetwork>
-#include <QtXml>
-#include <QRegExp>
-
-#include <QDebug>
-
-#include "java/JavaInstallList.h"
-#include "java/JavaCheckerJob.h"
-#include "java/JavaUtils.h"
-#include "MMCStrings.h"
-#include "minecraft/VersionFilterData.h"
-
-JavaInstallList::JavaInstallList(QObject *parent) : BaseVersionList(parent)
-{
-}
-
-Task *JavaInstallList::getLoadTask()
-{
-	return new JavaListLoadTask(this);
-}
-
-const BaseVersionPtr JavaInstallList::at(int i) const
-{
-	return m_vlist.at(i);
-}
-
-bool JavaInstallList::isLoaded()
-{
-	return m_loaded;
-}
-
-int JavaInstallList::count() const
-{
-	return m_vlist.count();
-}
-
-QVariant JavaInstallList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	auto version = std::dynamic_pointer_cast<JavaInstall>(m_vlist[index.row()]);
-	switch (role)
-	{
-		case VersionPointerRole:
-			return qVariantFromValue(m_vlist[index.row()]);
-		case VersionIdRole:
-			return version->descriptor();
-		case VersionRole:
-			return version->id.toString();
-		case RecommendedRole:
-			return version->recommended;
-		case PathRole:
-			return version->path;
-		case ArchitectureRole:
-			return version->arch;
-		default:
-			return QVariant();
-	}
-}
-
-BaseVersionList::RoleList JavaInstallList::providesRoles() const
-{
-	return {VersionPointerRole, VersionIdRole, VersionRole, RecommendedRole, PathRole, ArchitectureRole};
-}
-
-
-void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
-{
-	beginResetModel();
-	m_vlist = versions;
-	m_loaded = true;
-	sortVersions();
-	if(m_vlist.size())
-	{
-		auto best = std::dynamic_pointer_cast<JavaInstall>(m_vlist[0]);
-		best->recommended = true;
-	}
-	endResetModel();
-}
-
-bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
-{
-	auto rleft = std::dynamic_pointer_cast<JavaInstall>(left);
-	auto rright = std::dynamic_pointer_cast<JavaInstall>(right);
-	return (*rleft) > (*rright);
-}
-
-void JavaInstallList::sortVersions()
-{
-	beginResetModel();
-	std::sort(m_vlist.begin(), m_vlist.end(), sortJavas);
-	endResetModel();
-}
-
-JavaListLoadTask::JavaListLoadTask(JavaInstallList *vlist) : Task()
-{
-	m_list = vlist;
-	m_currentRecommended = NULL;
-}
-
-JavaListLoadTask::~JavaListLoadTask()
-{
-}
-
-void JavaListLoadTask::executeTask()
-{
-	setStatus(tr("Detecting Java installations..."));
-
-	JavaUtils ju;
-	QList<QString> candidate_paths = ju.FindJavaPaths();
-
-	m_job = std::shared_ptr<JavaCheckerJob>(new JavaCheckerJob("Java detection"));
-	connect(m_job.get(), SIGNAL(finished(QList<JavaCheckResult>)), this, SLOT(javaCheckerFinished(QList<JavaCheckResult>)));
-	connect(m_job.get(), &Task::progress, this, &Task::setProgress);
-
-	qDebug() << "Probing the following Java paths: ";
-	int id = 0;
-	for(QString candidate : candidate_paths)
-	{
-		qDebug() << " " << candidate;
-
-		auto candidate_checker = new JavaChecker();
-		candidate_checker->m_path = candidate;
-		candidate_checker->m_id = id;
-		m_job->addJavaCheckerAction(JavaCheckerPtr(candidate_checker));
-
-		id++;
-	}
-
-	m_job->start();
-}
-
-void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
-{
-	QList<JavaInstallPtr> candidates;
-
-	qDebug() << "Found the following valid Java installations:";
-	for(JavaCheckResult result : results)
-	{
-		if(result.valid)
-		{
-			JavaInstallPtr javaVersion(new JavaInstall());
-
-			javaVersion->id = result.javaVersion;
-			javaVersion->arch = result.mojangPlatform;
-			javaVersion->path = result.path;
-			candidates.append(javaVersion);
-
-			qDebug() << " " << javaVersion->id.toString() << javaVersion->arch << javaVersion->path;
-		}
-	}
-
-	QList<BaseVersionPtr> javas_bvp;
-	for (auto java : candidates)
-	{
-		//qDebug() << java->id << java->arch << " at " << java->path;
-		BaseVersionPtr bp_java = std::dynamic_pointer_cast<BaseVersion>(java);
-
-		if (bp_java)
-		{
-			javas_bvp.append(java);
-		}
-	}
-
-	m_list->updateListData(javas_bvp);
-	emitSucceeded();
-}
diff --git a/libraries/logic/java/JavaInstallList.h b/libraries/logic/java/JavaInstallList.h
deleted file mode 100644
index cf0e5784..00000000
--- a/libraries/logic/java/JavaInstallList.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QAbstractListModel>
-
-#include "BaseVersionList.h"
-#include "tasks/Task.h"
-
-#include "JavaCheckerJob.h"
-#include "JavaInstall.h"
-
-#include "multimc_logic_export.h"
-
-class JavaListLoadTask;
-
-class MULTIMC_LOGIC_EXPORT JavaInstallList : public BaseVersionList
-{
-	Q_OBJECT
-public:
-	explicit JavaInstallList(QObject *parent = 0);
-
-	virtual Task *getLoadTask() override;
-	virtual bool isLoaded() override;
-	virtual const BaseVersionPtr at(int i) const override;
-	virtual int count() const override;
-	virtual void sortVersions() override;
-
-	virtual QVariant data(const QModelIndex &index, int role) const override;
-	virtual RoleList providesRoles() const override;
-
-public slots:
-	virtual void updateListData(QList<BaseVersionPtr> versions) override;
-
-protected:
-	QList<BaseVersionPtr> m_vlist;
-
-	bool m_loaded = false;
-};
-
-class JavaListLoadTask : public Task
-{
-	Q_OBJECT
-
-public:
-	explicit JavaListLoadTask(JavaInstallList *vlist);
-	~JavaListLoadTask();
-
-	virtual void executeTask();
-public slots:
-	void javaCheckerFinished(QList<JavaCheckResult> results);
-
-protected:
-	std::shared_ptr<JavaCheckerJob> m_job;
-	JavaInstallList *m_list;
-	JavaInstall *m_currentRecommended;
-};
diff --git a/libraries/logic/java/JavaUtils.cpp b/libraries/logic/java/JavaUtils.cpp
deleted file mode 100644
index 88996e9f..00000000
--- a/libraries/logic/java/JavaUtils.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QStringList>
-#include <QString>
-#include <QDir>
-#include <QStringList>
-
-#include <settings/Setting.h>
-
-#include <QDebug>
-#include "java/JavaUtils.h"
-#include "java/JavaCheckerJob.h"
-#include "java/JavaInstallList.h"
-#include "FileSystem.h"
-
-JavaUtils::JavaUtils()
-{
-}
-
-JavaInstallPtr JavaUtils::MakeJavaPtr(QString path, QString id, QString arch)
-{
-	JavaInstallPtr javaVersion(new JavaInstall());
-
-	javaVersion->id = id;
-	javaVersion->arch = arch;
-	javaVersion->path = path;
-
-	return javaVersion;
-}
-
-JavaInstallPtr JavaUtils::GetDefaultJava()
-{
-	JavaInstallPtr javaVersion(new JavaInstall());
-
-	javaVersion->id = "java";
-	javaVersion->arch = "unknown";
-	javaVersion->path = "java";
-
-	return javaVersion;
-}
-
-#if defined(Q_OS_WIN32)
-QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName)
-{
-	QList<JavaInstallPtr> javas;
-
-	QString archType = "unknown";
-	if (keyType == KEY_WOW64_64KEY)
-		archType = "64";
-	else if (keyType == KEY_WOW64_32KEY)
-		archType = "32";
-
-	HKEY jreKey;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName.toStdString().c_str(), 0,
-					  KEY_READ | keyType | KEY_ENUMERATE_SUB_KEYS, &jreKey) == ERROR_SUCCESS)
-	{
-		// Read the current type version from the registry.
-		// This will be used to find any key that contains the JavaHome value.
-		char *value = new char[0];
-		DWORD valueSz = 0;
-		if (RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE *)value, &valueSz) ==
-			ERROR_MORE_DATA)
-		{
-			value = new char[valueSz];
-			RegQueryValueExA(jreKey, "CurrentVersion", NULL, NULL, (BYTE *)value, &valueSz);
-		}
-
-		QString recommended = value;
-
-		TCHAR subKeyName[255];
-		DWORD subKeyNameSize, numSubKeys, retCode;
-
-		// Get the number of subkeys
-		RegQueryInfoKey(jreKey, NULL, NULL, NULL, &numSubKeys, NULL, NULL, NULL, NULL, NULL,
-						NULL, NULL);
-
-		// Iterate until RegEnumKeyEx fails
-		if (numSubKeys > 0)
-		{
-			for (int i = 0; i < numSubKeys; i++)
-			{
-				subKeyNameSize = 255;
-				retCode = RegEnumKeyEx(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
-									   NULL);
-				if (retCode == ERROR_SUCCESS)
-				{
-					// Now open the registry key for the version that we just got.
-					QString newKeyName = keyName + "\\" + subKeyName;
-
-					HKEY newKey;
-					if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, newKeyName.toStdString().c_str(), 0,
-									 KEY_READ | KEY_WOW64_64KEY, &newKey) == ERROR_SUCCESS)
-					{
-						// Read the JavaHome value to find where Java is installed.
-						value = new char[0];
-						valueSz = 0;
-						if (RegQueryValueEx(newKey, "JavaHome", NULL, NULL, (BYTE *)value,
-											&valueSz) == ERROR_MORE_DATA)
-						{
-							value = new char[valueSz];
-							RegQueryValueEx(newKey, "JavaHome", NULL, NULL, (BYTE *)value,
-											&valueSz);
-
-							// Now, we construct the version object and add it to the list.
-							JavaInstallPtr javaVersion(new JavaInstall());
-
-							javaVersion->id = subKeyName;
-							javaVersion->arch = archType;
-							javaVersion->path =
-								QDir(FS::PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
-							javas.append(javaVersion);
-						}
-
-						RegCloseKey(newKey);
-					}
-				}
-			}
-		}
-
-		RegCloseKey(jreKey);
-	}
-
-	return javas;
-}
-
-QList<QString> JavaUtils::FindJavaPaths()
-{
-	QList<JavaInstallPtr> java_candidates;
-
-	QList<JavaInstallPtr> JRE64s = this->FindJavaFromRegistryKey(
-		KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-	QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey(
-		KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
-	QList<JavaInstallPtr> JRE32s = this->FindJavaFromRegistryKey(
-		KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-	QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey(
-		KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
-
-	java_candidates.append(JRE64s);
-	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/javaw.exe"));
-	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/javaw.exe"));
-	java_candidates.append(JDK64s);
-	java_candidates.append(JRE32s);
-	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/javaw.exe"));
-	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/javaw.exe"));
-	java_candidates.append(JDK32s);
-	java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));
-
-	QList<QString> candidates;
-	for(JavaInstallPtr java_candidate : java_candidates)
-	{
-		if(!candidates.contains(java_candidate->path))
-		{
-			candidates.append(java_candidate->path);
-		}
-	}
-
-	return candidates;
-}
-
-#elif defined(Q_OS_MAC)
-QList<QString> JavaUtils::FindJavaPaths()
-{
-	QList<QString> javas;
-	javas.append(this->GetDefaultJava()->path);
-	javas.append("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java");
-	javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
-	javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
-	QDir libraryJVMDir("/Library/Java/JavaVirtualMachines/");
-	QStringList libraryJVMJavas = libraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-	foreach (const QString &java, libraryJVMJavas) {
-		javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
-		javas.append(libraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/jre/bin/java");
-	}
-	QDir systemLibraryJVMDir("/System/Library/Java/JavaVirtualMachines/");
-	QStringList systemLibraryJVMJavas = systemLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-	foreach (const QString &java, systemLibraryJVMJavas) {
-		javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
-		javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
-	}
-	return javas;
-}
-
-#elif defined(Q_OS_LINUX)
-QList<QString> JavaUtils::FindJavaPaths()
-{
-	qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
-
-	QList<QString> javas;
-	javas.append(this->GetDefaultJava()->path);
-    javas.append("/opt/java/bin/java");
-    javas.append("/usr/bin/java");
-
-	return javas;
-}
-#else
-QList<QString> JavaUtils::FindJavaPaths()
-{
-	qDebug() << "Unknown operating system build - defaulting to \"java\"";
-
-	QList<QString> javas;
-	javas.append(this->GetDefaultJava()->path);
-
-	return javas;
-}
-#endif
diff --git a/libraries/logic/java/JavaUtils.h b/libraries/logic/java/JavaUtils.h
deleted file mode 100644
index 3fb88341..00000000
--- a/libraries/logic/java/JavaUtils.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QStringList>
-
-#include "JavaCheckerJob.h"
-#include "JavaChecker.h"
-#include "JavaInstallList.h"
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT JavaUtils : public QObject
-{
-	Q_OBJECT
-public:
-	JavaUtils();
-
-	JavaInstallPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown");
-	QList<QString> FindJavaPaths();
-	JavaInstallPtr GetDefaultJava();
-
-#ifdef Q_OS_WIN
-	QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
-#endif
-};
diff --git a/libraries/logic/java/JavaVersion.cpp b/libraries/logic/java/JavaVersion.cpp
deleted file mode 100644
index 84fc48a4..00000000
--- a/libraries/logic/java/JavaVersion.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "JavaVersion.h"
-#include <MMCStrings.h>
-
-#include <QRegularExpression>
-#include <QString>
-
-JavaVersion & JavaVersion::operator=(const QString & javaVersionString)
-{
-	string = javaVersionString;
-
-	auto getCapturedInteger = [](const QRegularExpressionMatch & match, const QString &what) -> int
-	{
-		auto str = match.captured(what);
-		if(str.isEmpty())
-		{
-			return 0;
-		}
-		return str.toInt();
-	};
-
-	QRegularExpression pattern;
-	if(javaVersionString.startsWith("1."))
-	{
-		pattern = QRegularExpression ("1[.](?<major>[0-9]+)([.](?<minor>[0-9]+))?(_(?<security>[0-9]+)?)?(-(?<prerelease>[a-zA-Z0-9]+))?");
-	}
-	else
-	{
-		pattern = QRegularExpression("(?<major>[0-9]+)([.](?<minor>[0-9]+))?([.](?<security>[0-9]+))?(-(?<prerelease>[a-zA-Z0-9]+))?");
-	}
-
-	auto match = pattern.match(string);
-	parseable = match.hasMatch();
-	major = getCapturedInteger(match, "major");
-	minor = getCapturedInteger(match, "minor");
-	security = getCapturedInteger(match, "security");
-	prerelease = match.captured("prerelease");
-	return *this;
-}
-
-JavaVersion::JavaVersion(const QString &rhs)
-{
-	operator=(rhs);
-}
-
-QString JavaVersion::toString()
-{
-	return string;
-}
-
-bool JavaVersion::requiresPermGen()
-{
-	if(parseable)
-	{
-		return major < 8;
-	}
-	return true;
-}
-
-bool JavaVersion::operator<(const JavaVersion &rhs)
-{
-	if(parseable && rhs.parseable)
-	{
-		if(major < rhs.major)
-			return true;
-		if(major > rhs.major)
-			return false;
-		if(minor < rhs.minor)
-			return true;
-		if(minor > rhs.minor)
-			return false;
-		if(security < rhs.security)
-			return true;
-		if(security > rhs.security)
-			return false;
-
-		// everything else being equal, consider prerelease status
-		bool thisPre = !prerelease.isEmpty();
-		bool rhsPre = !rhs.prerelease.isEmpty();
-		if(thisPre && !rhsPre)
-		{
-			// this is a prerelease and the other one isn't -> lesser
-			return true;
-		}
-		else if(!thisPre && rhsPre)
-		{
-			// this isn't a prerelease and the other one is -> greater
-			return false;
-		}
-		else if(thisPre && rhsPre)
-		{
-			// both are prereleases - use natural compare...
-			return Strings::naturalCompare(prerelease, rhs.prerelease, Qt::CaseSensitive) < 0;
-		}
-		// neither is prerelease, so they are the same -> this cannot be less than rhs
-		return false;
-	}
-	else return Strings::naturalCompare(string, rhs.string, Qt::CaseSensitive) < 0;
-}
-
-bool JavaVersion::operator==(const JavaVersion &rhs)
-{
-	if(parseable && rhs.parseable)
-	{
-		return major == rhs.major && minor == rhs.minor && security == rhs.security && prerelease == rhs.prerelease;
-	}
-	return string == rhs.string;
-}
-
-bool JavaVersion::operator>(const JavaVersion &rhs)
-{
-	return (!operator<(rhs)) && (!operator==(rhs));
-}
diff --git a/libraries/logic/java/JavaVersion.h b/libraries/logic/java/JavaVersion.h
deleted file mode 100644
index f9a733d3..00000000
--- a/libraries/logic/java/JavaVersion.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "multimc_logic_export.h"
-#include <QString>
-
-class MULTIMC_LOGIC_EXPORT JavaVersion
-{
-	friend class JavaVersionTest;
-public:
-	JavaVersion() {};
-	JavaVersion(const QString & rhs);
-
-	JavaVersion & operator=(const QString & rhs);
-
-	bool operator<(const JavaVersion & rhs);
-	bool operator==(const JavaVersion & rhs);
-	bool operator>(const JavaVersion & rhs);
-
-	bool requiresPermGen();
-
-	QString toString();
-
-private:
-	QString string;
-	int major = 0;
-	int minor = 0;
-	int security = 0;
-	bool parseable = false;
-	QString prerelease;
-};
diff --git a/libraries/logic/launch/LaunchStep.cpp b/libraries/logic/launch/LaunchStep.cpp
deleted file mode 100644
index 3078043b..00000000
--- a/libraries/logic/launch/LaunchStep.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LaunchStep.h"
-#include "LaunchTask.h"
-
-void LaunchStep::bind(LaunchTask *parent)
-{
-	m_parent = parent;
-	connect(this, &LaunchStep::readyForLaunch, parent, &LaunchTask::onReadyForLaunch);
-	connect(this, &LaunchStep::logLine, parent, &LaunchTask::onLogLine);
-	connect(this, &LaunchStep::logLines, parent, &LaunchTask::onLogLines);
-	connect(this, &LaunchStep::finished, parent, &LaunchTask::onStepFinished);
-	connect(this, &LaunchStep::progressReportingRequest, parent, &LaunchTask::onProgressReportingRequested);
-}
diff --git a/libraries/logic/launch/LaunchStep.h b/libraries/logic/launch/LaunchStep.h
deleted file mode 100644
index ea472c0d..00000000
--- a/libraries/logic/launch/LaunchStep.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "tasks/Task.h"
-#include "MessageLevel.h"
-
-#include <QStringList>
-
-class LaunchTask;
-class LaunchStep: public Task
-{
-	Q_OBJECT
-public: /* methods */
-	explicit LaunchStep(LaunchTask *parent):Task(nullptr), m_parent(parent)
-	{
-		bind(parent);
-	};
-	virtual ~LaunchStep() {};
-
-protected: /* methods */
-	virtual void bind(LaunchTask *parent);
-
-signals:
-	void logLines(QStringList lines, MessageLevel::Enum level);
-	void logLine(QString line, MessageLevel::Enum level);
-	void readyForLaunch();
-	void progressReportingRequest();
-
-public slots:
-	virtual void proceed() {};
-
-protected: /* data */
-	LaunchTask *m_parent;
-};
\ No newline at end of file
diff --git a/libraries/logic/launch/LaunchTask.cpp b/libraries/logic/launch/LaunchTask.cpp
deleted file mode 100644
index 5b7ff182..00000000
--- a/libraries/logic/launch/LaunchTask.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "launch/LaunchTask.h"
-#include "MessageLevel.h"
-#include "MMCStrings.h"
-#include "java/JavaChecker.h"
-#include "tasks/Task.h"
-#include <QDebug>
-#include <QDir>
-#include <QEventLoop>
-#include <QRegularExpression>
-#include <QCoreApplication>
-#include <QStandardPaths>
-#include <assert.h>
-
-void LaunchTask::init()
-{
-	m_instance->setRunning(true);
-}
-
-std::shared_ptr<LaunchTask> LaunchTask::create(InstancePtr inst)
-{
-	std::shared_ptr<LaunchTask> proc(new LaunchTask(inst));
-	proc->init();
-	return proc;
-}
-
-LaunchTask::LaunchTask(InstancePtr instance): m_instance(instance)
-{
-}
-
-void LaunchTask::appendStep(std::shared_ptr<LaunchStep> step)
-{
-	m_steps.append(step);
-}
-
-void LaunchTask::prependStep(std::shared_ptr<LaunchStep> step)
-{
-	m_steps.prepend(step);
-}
-
-void LaunchTask::executeTask()
-{
-	if(!m_steps.size())
-	{
-		state = LaunchTask::Finished;
-		emitSucceeded();
-	}
-	state = LaunchTask::Running;
-	onStepFinished();
-}
-
-void LaunchTask::onReadyForLaunch()
-{
-	state = LaunchTask::Waiting;
-	emit readyForLaunch();
-}
-
-void LaunchTask::onStepFinished()
-{
-	// initial -> just start the first step
-	if(currentStep == -1)
-	{
-		currentStep ++;
-		m_steps[currentStep]->start();
-		return;
-	}
-
-	auto step = m_steps[currentStep];
-	if(step->successful())
-	{
-		// end?
-		if(currentStep == m_steps.size() - 1)
-		{
-			emitSucceeded();
-		}
-		else
-		{
-			currentStep ++;
-			step = m_steps[currentStep];
-			step->start();
-		}
-	}
-	else
-	{
-		emitFailed(step->failReason());
-	}
-}
-
-void LaunchTask::onProgressReportingRequested()
-{
-	state = LaunchTask::Waiting;
-	emit requestProgress(m_steps[currentStep].get());
-}
-
-void LaunchTask::setCensorFilter(QMap<QString, QString> filter)
-{
-	m_censorFilter = filter;
-}
-
-QString LaunchTask::censorPrivateInfo(QString in)
-{
-	auto iter = m_censorFilter.begin();
-	while (iter != m_censorFilter.end())
-	{
-		in.replace(iter.key(), iter.value());
-		iter++;
-	}
-	return in;
-}
-
-void LaunchTask::proceed()
-{
-	if(state != LaunchTask::Waiting)
-	{
-		return;
-	}
-	m_steps[currentStep]->proceed();
-}
-
-bool LaunchTask::abort()
-{
-	switch(state)
-	{
-		case LaunchTask::Aborted:
-		case LaunchTask::Failed:
-		case LaunchTask::Finished:
-			return true;
-		case LaunchTask::NotStarted:
-		{
-			state = LaunchTask::Aborted;
-			emitFailed("Aborted");
-			return true;
-		}
-		case LaunchTask::Running:
-		case LaunchTask::Waiting:
-		{
-			auto step = m_steps[currentStep];
-			if(!step->canAbort())
-			{
-				return false;
-			}
-			if(step->abort())
-			{
-				state = LaunchTask::Aborted;
-				return true;
-			}
-		}
-		default:
-			break;
-	}
-	return false;
-}
-
-void LaunchTask::onLogLines(const QStringList &lines, MessageLevel::Enum defaultLevel)
-{
-	for (auto & line: lines)
-	{
-		onLogLine(line, defaultLevel);
-	}
-}
-
-void LaunchTask::onLogLine(QString line, MessageLevel::Enum level)
-{
-	// if the launcher part set a log level, use it
-	auto innerLevel = MessageLevel::fromLine(line);
-	if(innerLevel != MessageLevel::Unknown)
-	{
-		level = innerLevel;
-	}
-
-	// If the level is still undetermined, guess level
-	if (level == MessageLevel::StdErr || level == MessageLevel::StdOut || level == MessageLevel::Unknown)
-	{
-		level = m_instance->guessLevel(line, level);
-	}
-
-	// censor private user info
-	line = censorPrivateInfo(line);
-
-	emit log(line, level);
-}
-
-void LaunchTask::emitSucceeded()
-{
-	m_instance->cleanupAfterRun();
-	m_instance->setRunning(false);
-	Task::emitSucceeded();
-}
-
-void LaunchTask::emitFailed(QString reason)
-{
-	m_instance->cleanupAfterRun();
-	m_instance->setRunning(false);
-	Task::emitFailed(reason);
-}
-
-QString LaunchTask::substituteVariables(const QString &cmd) const
-{
-	QString out = cmd;
-	auto variables = m_instance->getVariables();
-	for (auto it = variables.begin(); it != variables.end(); ++it)
-	{
-		out.replace("$" + it.key(), it.value());
-	}
-	auto env = QProcessEnvironment::systemEnvironment();
-	for (auto var : env.keys())
-	{
-		out.replace("$" + var, env.value(var));
-	}
-	return out;
-}
-
diff --git a/libraries/logic/launch/LaunchTask.h b/libraries/logic/launch/LaunchTask.h
deleted file mode 100644
index 447445ca..00000000
--- a/libraries/logic/launch/LaunchTask.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *	 http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QProcess>
-#include "BaseInstance.h"
-#include "MessageLevel.h"
-#include "LoggedProcess.h"
-#include "LaunchStep.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT LaunchTask: public Task
-{
-	Q_OBJECT
-protected:
-	explicit LaunchTask(InstancePtr instance);
-	void init();
-
-public:
-	enum State
-	{
-		NotStarted,
-		Running,
-		Waiting,
-		Failed,
-		Aborted,
-		Finished
-	};
-
-public: /* methods */
-	static std::shared_ptr<LaunchTask> create(InstancePtr inst);
-	virtual ~LaunchTask() {};
-
-	void appendStep(std::shared_ptr<LaunchStep> step);
-	void prependStep(std::shared_ptr<LaunchStep> step);
-	void setCensorFilter(QMap<QString, QString> filter);
-
-	InstancePtr instance()
-	{
-		return m_instance;
-	}
-
-	void setPid(qint64 pid)
-	{
-		m_pid = pid;
-	}
-
-	qint64 pid()
-	{
-		return m_pid;
-	}
-
-	/**
-	 * @brief prepare the process for launch (for multi-stage launch)
-	 */
-	virtual void executeTask() override;
-
-	/**
-	 * @brief launch the armed instance
-	 */
-	void proceed();
-
-	/**
-	 * @brief abort launch
-	 */
-	virtual bool abort() override;
-
-public:
-	QString substituteVariables(const QString &cmd) const;
-	QString censorPrivateInfo(QString in);
-
-protected: /* methods */
-	virtual void emitFailed(QString reason) override;
-	virtual void emitSucceeded() override;
-
-signals:
-	/**
-	 * @brief emitted when the launch preparations are done
-	 */
-	void readyForLaunch();
-
-	void requestProgress(Task *task);
-
-	void requestLogging();
-
-	/**
-	 * @brief emitted when we want to log something
-	 * @param text the text to log
-	 * @param level the level to log at
-	 */
-	void log(QString text, MessageLevel::Enum level = MessageLevel::MultiMC);
-
-public slots:
-	void onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC);
-	void onLogLine(QString line, MessageLevel::Enum defaultLevel = MessageLevel::MultiMC);
-	void onReadyForLaunch();
-	void onStepFinished();
-	void onProgressReportingRequested();
-
-protected: /* data */
-	InstancePtr m_instance;
-	QList <std::shared_ptr<LaunchStep>> m_steps;
-	QMap<QString, QString> m_censorFilter;
-	int currentStep = -1;
-	State state = NotStarted;
-	qint64 m_pid = -1;
-};
diff --git a/libraries/logic/launch/LoggedProcess.cpp b/libraries/logic/launch/LoggedProcess.cpp
deleted file mode 100644
index 88ca40aa..00000000
--- a/libraries/logic/launch/LoggedProcess.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "LoggedProcess.h"
-#include "MessageLevel.h"
-#include <QDebug>
-
-LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)
-{
-	// QProcess has a strange interface... let's map a lot of those into a few.
-	connect(this, &QProcess::readyReadStandardOutput, this, &LoggedProcess::on_stdOut);
-	connect(this, &QProcess::readyReadStandardError, this, &LoggedProcess::on_stdErr);
-	connect(this, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(on_exit(int,QProcess::ExitStatus)));
-	connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(on_error(QProcess::ProcessError)));
-	connect(this, &QProcess::stateChanged, this, &LoggedProcess::on_stateChange);
-}
-
-QStringList reprocess(const QByteArray & data, QString & leftover)
-{
-	QString str = leftover + QString::fromLocal8Bit(data);
-
-	str.remove('\r');
-	QStringList lines = str.split("\n");
-	leftover = lines.takeLast();
-	return lines;
-}
-
-void LoggedProcess::on_stdErr()
-{
-	auto lines = reprocess(readAllStandardError(), m_err_leftover);
-	emit log(lines, MessageLevel::StdErr);
-}
-
-void LoggedProcess::on_stdOut()
-{
-	auto lines = reprocess(readAllStandardOutput(), m_out_leftover);
-	emit log(lines, MessageLevel::StdOut);
-}
-
-void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status)
-{
-	// save the exit code
-	m_exit_code = exit_code;
-
-	// Flush console window
-	if (!m_err_leftover.isEmpty())
-	{
-		emit log({m_err_leftover}, MessageLevel::StdErr);
-		m_err_leftover.clear();
-	}
-	if (!m_out_leftover.isEmpty())
-	{
-		emit log({m_err_leftover}, MessageLevel::StdOut);
-		m_out_leftover.clear();
-	}
-
-	// based on state, send signals
-	if (!m_is_aborting)
-	{
-		if (status == QProcess::NormalExit)
-		{
-			//: Message displayed on instance exit
-			emit log({tr("Process exited with code %1.").arg(exit_code)}, MessageLevel::MultiMC);
-			changeState(LoggedProcess::Finished);
-		}
-		else
-		{
-			//: Message displayed on instance crashed
-			if(exit_code == -1)
-				emit log({tr("Process crashed.")}, MessageLevel::MultiMC);
-			else
-				emit log({tr("Process crashed with exitcode %1.").arg(exit_code)}, MessageLevel::MultiMC);
-			changeState(LoggedProcess::Crashed);
-		}
-	}
-	else
-	{
-		//: Message displayed after the instance exits due to kill request
-		emit log({tr("Process was killed by user.")}, MessageLevel::Error);
-		changeState(LoggedProcess::Aborted);
-	}
-}
-
-void LoggedProcess::on_error(QProcess::ProcessError error)
-{
-	switch(error)
-	{
-		case QProcess::FailedToStart:
-		{
-			emit log({tr("The process failed to start.")}, MessageLevel::Fatal);
-			changeState(LoggedProcess::FailedToStart);
-			break;
-		}
-		// we'll just ignore those... never needed them
-		case QProcess::Crashed:
-		case QProcess::ReadError:
-		case QProcess::Timedout:
-		case QProcess::UnknownError:
-		case QProcess::WriteError:
-			break;
-	}
-}
-
-void LoggedProcess::kill()
-{
-	m_is_aborting = true;
-	QProcess::kill();
-}
-
-int LoggedProcess::exitCode() const
-{
-	return m_exit_code;
-}
-
-void LoggedProcess::changeState(LoggedProcess::State state)
-{
-	if(state == m_state)
-		return;
-	m_state = state;
-	emit stateChanged(m_state);
-}
-
-LoggedProcess::State LoggedProcess::state() const
-{
-	return m_state;
-}
-
-void LoggedProcess::on_stateChange(QProcess::ProcessState state)
-{
-	switch(state)
-	{
-		case QProcess::NotRunning:
-			break; // let's not - there are too many that handle this already.
-		case QProcess::Starting:
-		{
-			if(m_state != LoggedProcess::NotRunning)
-			{
-				qWarning() << "Wrong state change for process from state" << m_state << "to" << (int) LoggedProcess::Starting;
-			}
-			changeState(LoggedProcess::Starting);
-			return;
-		}
-		case QProcess::Running:
-		{
-			if(m_state != LoggedProcess::Starting)
-			{
-				qWarning() << "Wrong state change for process from state" << m_state << "to" << (int) LoggedProcess::Running;
-			}
-			changeState(LoggedProcess::Running);
-			return;
-		}
-	}
-}
-
-#if defined Q_OS_WIN32
-#include <windows.h>
-#endif
-
-qint64 LoggedProcess::processId() const
-{
-#ifdef Q_OS_WIN
-    return pid() ? pid()->dwProcessId : 0;
-#else
-    return pid();
-#endif
-}
diff --git a/libraries/logic/launch/LoggedProcess.h b/libraries/logic/launch/LoggedProcess.h
deleted file mode 100644
index baa53d79..00000000
--- a/libraries/logic/launch/LoggedProcess.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QProcess>
-#include "MessageLevel.h"
-
-/*
- * This is a basic process.
- * It has line-based logging support and hides some of the nasty bits.
- */
-class LoggedProcess : public QProcess
-{
-Q_OBJECT
-public:
-	enum State
-	{
-		NotRunning,
-		Starting,
-		FailedToStart,
-		Running,
-		Finished,
-		Crashed,
-		Aborted
-	};
-
-public:
-    explicit LoggedProcess(QObject* parent = 0);
-    virtual ~LoggedProcess() {};
-
-	State state() const;
-	int exitCode() const;
-	qint64 processId() const;
-
-signals:
-	void log(QStringList lines, MessageLevel::Enum level);
-	void stateChanged(LoggedProcess::State state);
-
-public slots:
-	/**
-	 * @brief kill the process - equivalent to kill -9
-	 */
-	void kill();
-
-
-private slots:
-	void on_stdErr();
-	void on_stdOut();
-	void on_exit(int exit_code, QProcess::ExitStatus status);
-	void on_error(QProcess::ProcessError error);
-	void on_stateChange(QProcess::ProcessState);
-
-private:
-	void changeState(LoggedProcess::State state);
-
-private:
-	QString m_err_leftover;
-	QString m_out_leftover;
-	bool m_killed = false;
-	State m_state = NotRunning;
-	int m_exit_code = 0;
-	bool m_is_aborting = false;
-};
diff --git a/libraries/logic/launch/MessageLevel.cpp b/libraries/logic/launch/MessageLevel.cpp
deleted file mode 100644
index a5191290..00000000
--- a/libraries/logic/launch/MessageLevel.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "MessageLevel.h"
-
-MessageLevel::Enum MessageLevel::getLevel(const QString& levelName)
-{
-	if (levelName == "MultiMC")
-		return MessageLevel::MultiMC;
-	else if (levelName == "Debug")
-		return MessageLevel::Debug;
-	else if (levelName == "Info")
-		return MessageLevel::Info;
-	else if (levelName == "Message")
-		return MessageLevel::Message;
-	else if (levelName == "Warning")
-		return MessageLevel::Warning;
-	else if (levelName == "Error")
-		return MessageLevel::Error;
-	else if (levelName == "Fatal")
-		return MessageLevel::Fatal;
-	// Skip PrePost, it's not exposed to !![]!
-	// Also skip StdErr and StdOut
-	else
-		return MessageLevel::Unknown;
-}
-
-MessageLevel::Enum MessageLevel::fromLine(QString &line)
-{
-	// Level prefix
-	int endmark = line.indexOf("]!");
-	if (line.startsWith("!![") && endmark != -1)
-	{
-		auto level = MessageLevel::getLevel(line.left(endmark).mid(3));
-		line = line.mid(endmark + 2);
-		return level;
-	}
-	return MessageLevel::Unknown;
-}
diff --git a/libraries/logic/launch/MessageLevel.h b/libraries/logic/launch/MessageLevel.h
deleted file mode 100644
index 0128148d..00000000
--- a/libraries/logic/launch/MessageLevel.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <QString>
-
-/**
- * @brief the MessageLevel Enum
- * defines what level a log message is
- */
-namespace MessageLevel
-{
-enum Enum
-{
-	Unknown, /**< No idea what this is or where it came from */
-	StdOut,  /**< Undetermined stderr messages */
-	StdErr,  /**< Undetermined stdout messages */
-	MultiMC, /**< MultiMC Messages */
-	Debug,   /**< Debug Messages */
-	Info,    /**< Info Messages */
-	Message, /**< Standard Messages */
-	Warning, /**< Warnings */
-	Error,   /**< Errors */
-	Fatal,   /**< Fatal Errors */
-};
-MessageLevel::Enum getLevel(const QString &levelName);
-
-/* Get message level from a line. Line is modified if it was successful. */
-MessageLevel::Enum fromLine(QString &line);
-}
diff --git a/libraries/logic/launch/steps/CheckJava.cpp b/libraries/logic/launch/steps/CheckJava.cpp
deleted file mode 100644
index a4eaa307..00000000
--- a/libraries/logic/launch/steps/CheckJava.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "CheckJava.h"
-#include <launch/LaunchTask.h>
-#include <FileSystem.h>
-#include <QStandardPaths>
-#include <QFileInfo>
-
-void CheckJava::executeTask()
-{
-	auto instance = m_parent->instance();
-	auto settings = instance->settings();
-	m_javaPath = FS::ResolveExecutable(settings->get("JavaPath").toString());
-	bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
-
-	auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
-	if (realJavaPath.isEmpty())
-	{
-		if (perInstance)
-		{
-			emit logLine(
-				tr("The java binary \"%1\" couldn't be found. Please fix the java path "
-				   "override in the instance's settings or disable it.").arg(m_javaPath),
-				MessageLevel::Warning);
-		}
-		else
-		{
-			emit logLine(tr("The java binary \"%1\" couldn't be found. Please set up java in "
-							"the settings.").arg(m_javaPath),
-						 MessageLevel::Warning);
-		}
-		emitFailed(tr("Java path is not valid."));
-		return;
-	}
-	else
-	{
-		emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::MultiMC);
-	}
-
-	QFileInfo javaInfo(realJavaPath);
-	qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
-	auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
-	m_javaUnixTime = javaUnixTime;
-	// if they are not the same, check!
-	if (javaUnixTime != storedUnixTime)
-	{
-		m_JavaChecker = std::make_shared<JavaChecker>();
-		QString errorLog;
-		QString version;
-		emit logLine(tr("Checking Java version..."), MessageLevel::MultiMC);
-		connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this,
-				&CheckJava::checkJavaFinished);
-		m_JavaChecker->m_path = realJavaPath;
-		m_JavaChecker->performCheck();
-		return;
-	}
-	emitSucceeded();
-}
-
-void CheckJava::checkJavaFinished(JavaCheckResult result)
-{
-	if (!result.valid)
-	{
-		// Error message displayed if java can't start
-		emit logLine(tr("Could not start java:"), MessageLevel::Error);
-		emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
-		emit logLine("\nCheck your MultiMC Java settings.", MessageLevel::MultiMC);
-		emitFailed(tr("Could not start java!"));
-	}
-	else
-	{
-		auto instance = m_parent->instance();
-		emit logLine(tr("Java version is %1!\n").arg(result.javaVersion.toString()),
-					 MessageLevel::MultiMC);
-		instance->settings()->set("JavaVersion", result.javaVersion.toString());
-		instance->settings()->set("JavaTimestamp", m_javaUnixTime);
-		emitSucceeded();
-	}
-}
diff --git a/libraries/logic/launch/steps/CheckJava.h b/libraries/logic/launch/steps/CheckJava.h
deleted file mode 100644
index b63dd4f4..00000000
--- a/libraries/logic/launch/steps/CheckJava.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-#include <java/JavaChecker.h>
-
-class CheckJava: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit CheckJava(LaunchTask *parent) :LaunchStep(parent){};
-	virtual ~CheckJava() {};
-
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
-private slots:
-	void checkJavaFinished(JavaCheckResult result);
-
-private:
-	QString m_javaPath;
-	qlonglong m_javaUnixTime;
-	JavaCheckerPtr m_JavaChecker;
-};
diff --git a/libraries/logic/launch/steps/LaunchMinecraft.cpp b/libraries/logic/launch/steps/LaunchMinecraft.cpp
deleted file mode 100644
index 77a89f17..00000000
--- a/libraries/logic/launch/steps/LaunchMinecraft.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LaunchMinecraft.h"
-#include <launch/LaunchTask.h>
-#include <minecraft/MinecraftInstance.h>
-#include <FileSystem.h>
-#include <QStandardPaths>
-
-LaunchMinecraft::LaunchMinecraft(LaunchTask *parent) : LaunchStep(parent)
-{
-	connect(&m_process, &LoggedProcess::log, this, &LaunchMinecraft::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &LaunchMinecraft::on_state);
-}
-
-void LaunchMinecraft::executeTask()
-{
-	auto instance = m_parent->instance();
-	std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-
-	m_launchScript = minecraftInstance->createLaunchScript(m_session);
-
-	QStringList args = minecraftInstance->javaArguments();
-
-	// HACK: this is a workaround for MCL-3732 - 'server-resource-packs' is created.
-	if(!FS::ensureFolderPathExists(FS::PathCombine(minecraftInstance->minecraftRoot(), "server-resource-packs")))
-	{
-		emit logLine(tr("Couldn't create the 'server-resource-packs' folder"), MessageLevel::Error);
-	}
-
-	QString allArgs = args.join(", ");
-	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
-
-	auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-	m_process.setProcessEnvironment(instance->createEnvironment());
-
-	QString wrapperCommand = instance->getWrapperCommand();
-	if(!wrapperCommand.isEmpty())
-	{
-		auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-		if (realWrapperCommand.isEmpty())
-		{
-			QString reason = tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand);
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		emit logLine("Wrapper command is:\n" + wrapperCommand + "\n\n", MessageLevel::MultiMC);
-		args.prepend(javaPath);
-		m_process.start(wrapperCommand, args);
-	}
-	else
-	{
-		m_process.start(javaPath, args);
-	}
-}
-
-void LaunchMinecraft::on_state(LoggedProcess::State state)
-{
-	switch(state)
-	{
-		case LoggedProcess::FailedToStart:
-		{
-			//: Error message displayed if instace can't start
-			QString reason = tr("Could not launch minecraft!");
-			emit logLine(reason, MessageLevel::Fatal);
-			emitFailed(reason);
-			return;
-		}
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-
-		{
-			m_parent->setPid(-1);
-			emitFailed("Game crashed.");
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			m_parent->setPid(-1);
-			// if the exit code wasn't 0, report this as a crash
-			auto exitCode = m_process.exitCode();
-			if(exitCode != 0)
-			{
-				emitFailed("Game crashed.");
-				return;
-			}
-			//FIXME: make this work again
-			// m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-			// run post-exit
-			emitSucceeded();
-			break;
-		}
-		case LoggedProcess::Running:
-			emit logLine(tr("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MultiMC);
-			m_parent->setPid(m_process.processId());
-			m_parent->instance()->setLastLaunch();
-			// send the launch script to the launcher part
-			m_process.write(m_launchScript.toUtf8());
-
-			mayProceed = true;
-			emit readyForLaunch();
-			break;
-		default:
-			break;
-	}
-}
-
-void LaunchMinecraft::setWorkingDirectory(const QString &wd)
-{
-	m_process.setWorkingDirectory(wd);
-}
-
-void LaunchMinecraft::proceed()
-{
-	if(mayProceed)
-	{
-		QString launchString("launch\n");
-		m_process.write(launchString.toUtf8());
-		mayProceed = false;
-	}
-}
-
-bool LaunchMinecraft::abort()
-{
-	if(mayProceed)
-	{
-		mayProceed = false;
-		QString launchString("abort\n");
-		m_process.write(launchString.toUtf8());
-	}
-	else
-	{
-		auto state = m_process.state();
-		if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-		{
-			m_process.kill();
-		}
-	}
-	return true;
-}
diff --git a/libraries/logic/launch/steps/LaunchMinecraft.h b/libraries/logic/launch/steps/LaunchMinecraft.h
deleted file mode 100644
index 6b9f7919..00000000
--- a/libraries/logic/launch/steps/LaunchMinecraft.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-#include <minecraft/auth/AuthSession.h>
-
-class LaunchMinecraft: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit LaunchMinecraft(LaunchTask *parent);
-	virtual void executeTask();
-	virtual bool abort();
-	virtual void proceed();
-	virtual bool canAbort() const
-	{
-		return true;
-	}
-	void setWorkingDirectory(const QString &wd);
-	void setAuthSession(AuthSessionPtr session)
-	{
-		m_session = session;
-	}
-private slots:
-	void on_state(LoggedProcess::State state);
-
-private:
-	LoggedProcess m_process;
-	QString m_command;
-	QString m_launchScript;
-	AuthSessionPtr m_session;
-	bool mayProceed = false;
-};
diff --git a/libraries/logic/launch/steps/ModMinecraftJar.cpp b/libraries/logic/launch/steps/ModMinecraftJar.cpp
deleted file mode 100644
index fce2d70a..00000000
--- a/libraries/logic/launch/steps/ModMinecraftJar.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ModMinecraftJar.h"
-#include <launch/LaunchTask.h>
-#include <QStandardPaths>
-
-void ModMinecraftJar::executeTask()
-{
-	m_jarModTask = m_parent->instance()->createJarModdingTask();
-	if(m_jarModTask)
-	{
-		connect(m_jarModTask.get(), SIGNAL(finished()), this, SLOT(jarModdingFinished()));
-		m_jarModTask->start();
-		return;
-	}
-	emitSucceeded();
-}
-
-void ModMinecraftJar::jarModdingFinished()
-{
-	if(m_jarModTask->successful())
-	{
-		emitSucceeded();
-	}
-	else
-	{
-		QString reason = tr("jar modding failed because: %1.\n\n").arg(m_jarModTask->failReason());
-		emit logLine(reason, MessageLevel::Fatal);
-		emitFailed(reason);
-	}
-}
diff --git a/libraries/logic/launch/steps/ModMinecraftJar.h b/libraries/logic/launch/steps/ModMinecraftJar.h
deleted file mode 100644
index b35dfafa..00000000
--- a/libraries/logic/launch/steps/ModMinecraftJar.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <memory>
-
-// FIXME: temporary wrapper for existing task.
-class ModMinecraftJar: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
-	virtual ~ModMinecraftJar(){};
-
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
-private slots:
-	void jarModdingFinished();
-
-private:
-	std::shared_ptr<Task> m_jarModTask;
-};
diff --git a/libraries/logic/launch/steps/PostLaunchCommand.cpp b/libraries/logic/launch/steps/PostLaunchCommand.cpp
deleted file mode 100644
index 29a45f1b..00000000
--- a/libraries/logic/launch/steps/PostLaunchCommand.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PostLaunchCommand.h"
-#include <launch/LaunchTask.h>
-
-PostLaunchCommand::PostLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
-{
-	auto instance = m_parent->instance();
-	m_command = instance->getPostExitCommand();
-	m_process.setProcessEnvironment(instance->createEnvironment());
-	connect(&m_process, &LoggedProcess::log, this, &PostLaunchCommand::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &PostLaunchCommand::on_state);
-}
-
-void PostLaunchCommand::executeTask()
-{
-	QString postlaunch_cmd = m_parent->substituteVariables(m_command);
-	emit logLine(tr("Running Post-Launch command: %1").arg(postlaunch_cmd), MessageLevel::MultiMC);
-	m_process.start(postlaunch_cmd);
-}
-
-void PostLaunchCommand::on_state(LoggedProcess::State state)
-{
-	auto getError = [&]()
-	{
-		return tr("Post-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
-	};
-	switch(state)
-	{
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-		case LoggedProcess::FailedToStart:
-		{
-			auto error = getError();
-			emit logLine(error, MessageLevel::Fatal);
-			emitFailed(error);
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			if(m_process.exitCode() != 0)
-			{
-				auto error = getError();
-				emit logLine(error, MessageLevel::Fatal);
-				emitFailed(error);
-			}
-			else
-			{
-				emit logLine(tr("Post-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
-				emitSucceeded();
-			}
-		}
-		default:
-			break;
-	}
-}
-
-void PostLaunchCommand::setWorkingDirectory(const QString &wd)
-{
-	m_process.setWorkingDirectory(wd);
-}
-
-bool PostLaunchCommand::abort()
-{
-	auto state = m_process.state();
-	if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-	{
-		m_process.kill();
-	}
-	return true;
-}
diff --git a/libraries/logic/launch/steps/PostLaunchCommand.h b/libraries/logic/launch/steps/PostLaunchCommand.h
deleted file mode 100644
index 4d5b0a52..00000000
--- a/libraries/logic/launch/steps/PostLaunchCommand.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-
-class PostLaunchCommand: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit PostLaunchCommand(LaunchTask *parent);
-	virtual void executeTask();
-	virtual bool abort();
-	virtual bool canAbort() const
-	{
-		return true;
-	}
-	void setWorkingDirectory(const QString &wd);
-private slots:
-	void on_state(LoggedProcess::State state);
-
-private:
-	LoggedProcess m_process;
-	QString m_command;
-};
diff --git a/libraries/logic/launch/steps/PreLaunchCommand.cpp b/libraries/logic/launch/steps/PreLaunchCommand.cpp
deleted file mode 100644
index 47197a82..00000000
--- a/libraries/logic/launch/steps/PreLaunchCommand.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PreLaunchCommand.h"
-#include <launch/LaunchTask.h>
-
-PreLaunchCommand::PreLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
-{
-	auto instance = m_parent->instance();
-	m_command = instance->getPreLaunchCommand();
-	m_process.setProcessEnvironment(instance->createEnvironment());
-	connect(&m_process, &LoggedProcess::log, this, &PreLaunchCommand::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &PreLaunchCommand::on_state);
-}
-
-void PreLaunchCommand::executeTask()
-{
-	//FIXME: where to put this?
-	QString prelaunch_cmd = m_parent->substituteVariables(m_command);
-	emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::MultiMC);
-	m_process.start(prelaunch_cmd);
-}
-
-void PreLaunchCommand::on_state(LoggedProcess::State state)
-{
-	auto getError = [&]()
-	{
-		return tr("Pre-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
-	};
-	switch(state)
-	{
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-		case LoggedProcess::FailedToStart:
-		{
-			auto error = getError();
-			emit logLine(error, MessageLevel::Fatal);
-			emitFailed(error);
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			if(m_process.exitCode() != 0)
-			{
-				auto error = getError();
-				emit logLine(error, MessageLevel::Fatal);
-				emitFailed(error);
-			}
-			else
-			{
-				emit logLine(tr("Pre-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
-				emitSucceeded();
-			}
-		}
-		default:
-			break;
-	}
-}
-
-void PreLaunchCommand::setWorkingDirectory(const QString &wd)
-{
-	m_process.setWorkingDirectory(wd);
-}
-
-bool PreLaunchCommand::abort()
-{
-	auto state = m_process.state();
-	if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-	{
-		m_process.kill();
-	}
-	return true;
-}
diff --git a/libraries/logic/launch/steps/PreLaunchCommand.h b/libraries/logic/launch/steps/PreLaunchCommand.h
deleted file mode 100644
index 077bdfca..00000000
--- a/libraries/logic/launch/steps/PreLaunchCommand.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-
-class PreLaunchCommand: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit PreLaunchCommand(LaunchTask *parent);
-	virtual void executeTask();
-	virtual bool abort();
-	virtual bool canAbort() const
-	{
-		return true;
-	}
-	void setWorkingDirectory(const QString &wd);
-private slots:
-	void on_state(LoggedProcess::State state);
-
-private:
-	LoggedProcess m_process;
-	QString m_command;
-};
diff --git a/libraries/logic/launch/steps/TextPrint.cpp b/libraries/logic/launch/steps/TextPrint.cpp
deleted file mode 100644
index f307b1fd..00000000
--- a/libraries/logic/launch/steps/TextPrint.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "TextPrint.h"
-
-TextPrint::TextPrint(LaunchTask * parent, const QStringList &lines, MessageLevel::Enum level) : LaunchStep(parent)
-{
-	m_lines = lines;
-	m_level = level;
-}
-TextPrint::TextPrint(LaunchTask *parent, const QString &line, MessageLevel::Enum level) : LaunchStep(parent)
-{
-	m_lines.append(line);
-	m_level = level;
-}
-
-void TextPrint::executeTask()
-{
-	emit logLines(m_lines, m_level);
-	emitSucceeded();
-}
-
-bool TextPrint::canAbort() const
-{
-	return true;
-}
-
-bool TextPrint::abort()
-{
-	emitFailed("Aborted.");
-	return true;
-}
diff --git a/libraries/logic/launch/steps/TextPrint.h b/libraries/logic/launch/steps/TextPrint.h
deleted file mode 100644
index fdd9014a..00000000
--- a/libraries/logic/launch/steps/TextPrint.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-#include <java/JavaChecker.h>
-
-#include "multimc_logic_export.h"
-
-/*
- * FIXME: maybe do not export
- */
-
-class MULTIMC_LOGIC_EXPORT TextPrint: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit TextPrint(LaunchTask *parent, const QStringList &lines, MessageLevel::Enum level);
-	explicit TextPrint(LaunchTask *parent, const QString &line, MessageLevel::Enum level);
-	virtual ~TextPrint(){};
-
-	virtual void executeTask();
-	virtual bool canAbort() const;
-	virtual bool abort();
-
-private:
-	QStringList m_lines;
-	MessageLevel::Enum m_level;
-};
diff --git a/libraries/logic/launch/steps/Update.cpp b/libraries/logic/launch/steps/Update.cpp
deleted file mode 100644
index 4901f001..00000000
--- a/libraries/logic/launch/steps/Update.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Update.h"
-#include <launch/LaunchTask.h>
-
-void Update::executeTask()
-{
-	m_updateTask = m_parent->instance()->createUpdateTask();
-	if(m_updateTask)
-	{
-		connect(m_updateTask.get(), SIGNAL(finished()), this, SLOT(updateFinished()));
-		connect(m_updateTask.get(), &Task::progress, this, &Task::setProgress);
-		connect(m_updateTask.get(), &Task::status, this, &Task::setStatus);
-		emit progressReportingRequest();
-		return;
-	}
-	emitSucceeded();
-}
-
-void Update::proceed()
-{
-	m_updateTask->start();
-}
-
-void Update::updateFinished()
-{
-	if(m_updateTask->successful())
-	{
-		emitSucceeded();
-	}
-	else
-	{
-		QString reason = tr("Instance update failed because: %1.\n\n").arg(m_updateTask->failReason());
-		emit logLine(reason, MessageLevel::Fatal);
-		emitFailed(reason);
-	}
-}
diff --git a/libraries/logic/launch/steps/Update.h b/libraries/logic/launch/steps/Update.h
deleted file mode 100644
index 14928253..00000000
--- a/libraries/logic/launch/steps/Update.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <launch/LaunchStep.h>
-#include <launch/LoggedProcess.h>
-#include <java/JavaChecker.h>
-
-// FIXME: stupid. should be defined by the instance type? or even completely abstracted away...
-class Update: public LaunchStep
-{
-	Q_OBJECT
-public:
-	explicit Update(LaunchTask *parent):LaunchStep(parent) {};
-	virtual ~Update() {};
-
-	virtual void executeTask();
-	virtual bool canAbort() const
-	{
-		return false;
-	}
-	virtual void proceed();
-private slots:
-	void updateFinished();
-
-private:
-	std::shared_ptr<Task> m_updateTask;
-};
diff --git a/libraries/logic/minecraft/AssetsUtils.cpp b/libraries/logic/minecraft/AssetsUtils.cpp
deleted file mode 100644
index 7a525abe..00000000
--- a/libraries/logic/minecraft/AssetsUtils.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QFileInfo>
-#include <QDir>
-#include <QDirIterator>
-#include <QCryptographicHash>
-#include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QVariant>
-#include <QDebug>
-
-#include "AssetsUtils.h"
-#include "FileSystem.h"
-#include "net/MD5EtagDownload.h"
-
-namespace AssetsUtils
-{
-
-/*
- * Returns true on success, with index populated
- * index is undefined otherwise
- */
-bool loadAssetsIndexJson(QString assetsId, QString path, AssetsIndex *index)
-{
-	/*
-	{
-	  "objects": {
-		"icons/icon_16x16.png": {
-		  "hash": "bdf48ef6b5d0d23bbb02e17d04865216179f510a",
-		  "size": 3665
-		},
-		...
-		}
-	  }
-	}
-	*/
-
-	QFile file(path);
-
-	// Try to open the file and fail if we can't.
-	// TODO: We should probably report this error to the user.
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		qCritical() << "Failed to read assets index file" << path;
-		return false;
-	}
-	index->id = assetsId;
-
-	// Read the file and close it.
-	QByteArray jsonData = file.readAll();
-	file.close();
-
-	QJsonParseError parseError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parseError);
-
-	// Fail if the JSON is invalid.
-	if (parseError.error != QJsonParseError::NoError)
-	{
-		qCritical() << "Failed to parse assets index file:" << parseError.errorString()
-					 << "at offset " << QString::number(parseError.offset);
-		return false;
-	}
-
-	// Make sure the root is an object.
-	if (!jsonDoc.isObject())
-	{
-		qCritical() << "Invalid assets index JSON: Root should be an array.";
-		return false;
-	}
-
-	QJsonObject root = jsonDoc.object();
-
-	QJsonValue isVirtual = root.value("virtual");
-	if (!isVirtual.isUndefined())
-	{
-		index->isVirtual = isVirtual.toBool(false);
-	}
-
-	QJsonValue objects = root.value("objects");
-	QVariantMap map = objects.toVariant().toMap();
-
-	for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter)
-	{
-		// qDebug() << iter.key();
-
-		QVariant variant = iter.value();
-		QVariantMap nested_objects = variant.toMap();
-
-		AssetObject object;
-
-		for (QVariantMap::const_iterator nested_iter = nested_objects.begin();
-			 nested_iter != nested_objects.end(); ++nested_iter)
-		{
-			// qDebug() << nested_iter.key() << nested_iter.value().toString();
-			QString key = nested_iter.key();
-			QVariant value = nested_iter.value();
-
-			if (key == "hash")
-			{
-				object.hash = value.toString();
-			}
-			else if (key == "size")
-			{
-				object.size = value.toDouble();
-			}
-		}
-
-		index->objects.insert(iter.key(), object);
-	}
-
-	return true;
-}
-
-QDir reconstructAssets(QString assetsId)
-{
-	QDir assetsDir = QDir("assets/");
-	QDir indexDir = QDir(FS::PathCombine(assetsDir.path(), "indexes"));
-	QDir objectDir = QDir(FS::PathCombine(assetsDir.path(), "objects"));
-	QDir virtualDir = QDir(FS::PathCombine(assetsDir.path(), "virtual"));
-
-	QString indexPath = FS::PathCombine(indexDir.path(), assetsId + ".json");
-	QFile indexFile(indexPath);
-	QDir virtualRoot(FS::PathCombine(virtualDir.path(), assetsId));
-
-	if (!indexFile.exists())
-	{
-		qCritical() << "No assets index file" << indexPath << "; can't reconstruct assets";
-		return virtualRoot;
-	}
-
-	qDebug() << "reconstructAssets" << assetsDir.path() << indexDir.path()
-				 << objectDir.path() << virtualDir.path() << virtualRoot.path();
-
-	AssetsIndex index;
-	bool loadAssetsIndex = AssetsUtils::loadAssetsIndexJson(assetsId, indexPath, &index);
-
-	if (loadAssetsIndex && index.isVirtual)
-	{
-		qDebug() << "Reconstructing virtual assets folder at" << virtualRoot.path();
-
-		for (QString map : index.objects.keys())
-		{
-			AssetObject asset_object = index.objects.value(map);
-			QString target_path = FS::PathCombine(virtualRoot.path(), map);
-			QFile target(target_path);
-
-			QString tlk = asset_object.hash.left(2);
-
-			QString original_path = FS::PathCombine(objectDir.path(), tlk, asset_object.hash);
-			QFile original(original_path);
-			if (!original.exists())
-				continue;
-			if (!target.exists())
-			{
-				QFileInfo info(target_path);
-				QDir target_dir = info.dir();
-				// qDebug() << target_dir;
-				if (!target_dir.exists())
-					QDir("").mkpath(target_dir.path());
-
-				bool couldCopy = original.copy(target_path);
-				qDebug() << " Copying" << original_path << "to" << target_path
-							 << QString::number(couldCopy); // << original.errorString();
-			}
-		}
-
-		// TODO: Write last used time to virtualRoot/.lastused
-	}
-
-	return virtualRoot;
-}
-
-}
-
-NetActionPtr AssetObject::getDownloadAction()
-{
-	QFileInfo objectFile(getLocalPath());
-	if ((!objectFile.isFile()) || (objectFile.size() != size))
-	{
-		auto objectDL = MD5EtagDownload::make(getUrl(), objectFile.filePath());
-		objectDL->m_total_progress = size;
-		return objectDL;
-	}
-	return nullptr;
-}
-
-QString AssetObject::getLocalPath()
-{
-	return "assets/objects/" + getRelPath();
-}
-
-QUrl AssetObject::getUrl()
-{
-	return QUrl("http://resources.download.minecraft.net/" + getRelPath());
-}
-
-QString AssetObject::getRelPath()
-{
-	return hash.left(2) + "/" + hash;
-}
-
-NetJobPtr AssetsIndex::getDownloadJob()
-{
-	auto job = new NetJob(QObject::tr("Assets for %1").arg(id));
-	for (auto &object : objects.values())
-	{
-		auto dl = object.getDownloadAction();
-		if(dl)
-		{
-			job->addNetAction(dl);
-		}
-	}
-	if(job->size())
-		return job;
-	return nullptr;
-}
diff --git a/libraries/logic/minecraft/AssetsUtils.h b/libraries/logic/minecraft/AssetsUtils.h
deleted file mode 100644
index 90251c2d..00000000
--- a/libraries/logic/minecraft/AssetsUtils.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QMap>
-#include "net/NetAction.h"
-#include "net/NetJob.h"
-
-struct AssetObject
-{
-	QString getRelPath();
-	QUrl getUrl();
-	QString getLocalPath();
-	NetActionPtr getDownloadAction();
-
-	QString hash;
-	qint64 size;
-};
-
-struct AssetsIndex
-{
-	NetJobPtr getDownloadJob();
-
-	QString id;
-	QMap<QString, AssetObject> objects;
-	bool isVirtual = false;
-};
-
-namespace AssetsUtils
-{
-bool loadAssetsIndexJson(QString id, QString file, AssetsIndex* index);
-/// Reconstruct a virtual assets folder for the given assets ID and return the folder
-QDir reconstructAssets(QString assetsId);
-}
diff --git a/libraries/logic/minecraft/GradleSpecifier.h b/libraries/logic/minecraft/GradleSpecifier.h
deleted file mode 100644
index 18308537..00000000
--- a/libraries/logic/minecraft/GradleSpecifier.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QStringList>
-#include "DefaultVariable.h"
-
-struct GradleSpecifier
-{
-	GradleSpecifier()
-	{
-		m_valid = false;
-	}
-	GradleSpecifier(QString value)
-	{
-		operator=(value);
-	}
-	GradleSpecifier & operator =(const QString & value)
-	{
-		/*
-		org.gradle.test.classifiers : service : 1.0 : jdk15 @ jar
-		DEBUG   0 "org.gradle.test.classifiers:service:1.0:jdk15@jar" 
-		DEBUG   1 "org.gradle.test.classifiers" 
-		DEBUG   2 "service" 
-		DEBUG   3 "1.0" 
-		DEBUG   4 ":jdk15" 
-		DEBUG   5 "jdk15" 
-		DEBUG   6 "@jar" 
-		DEBUG   7 "jar"
-		*/
-		QRegExp matcher("([^:@]+):([^:@]+):([^:@]+)" "(:([^:@]+))?" "(@([^:@]+))?");
-		m_valid = matcher.exactMatch(value);
-		auto elements = matcher.capturedTexts();
-		m_groupId = elements[1];
-		m_artifactId = elements[2];
-		m_version = elements[3];
-		m_classifier = elements[5];
-		if(!elements[7].isEmpty())
-		{
-			m_extension = elements[7];
-		}
-		return *this;
-	}
-	operator QString() const
-	{
-		if(!m_valid)
-			return "INVALID";
-		QString retval = m_groupId + ":" + m_artifactId + ":" + m_version;
-		if(!m_classifier.isEmpty())
-		{
-			retval += ":" + m_classifier;
-		}
-		if(m_extension.isExplicit())
-		{
-			retval += "@" + m_extension;
-		}
-		return retval;
-	}
-	QString toPath() const
-	{
-		if(!m_valid)
-			return "INVALID";
-		QString path = m_groupId;
-		path.replace('.', '/');
-		path += '/' + m_artifactId + '/' + m_version + '/' + m_artifactId + '-' + m_version;
-		if(!m_classifier.isEmpty())
-		{
-			path += "-" + m_classifier;
-		}
-		path += "." + m_extension;
-		return path;
-	}
-	inline bool valid() const
-	{
-		return m_valid;
-	}
-	inline QString version() const
-	{
-		return m_version;
-	}
-	inline QString groupId() const
-	{
-		return m_groupId;
-	}
-	inline QString artifactId() const
-	{
-		return m_artifactId;
-	}
-	inline void setClassifier(const QString & classifier)
-	{
-		m_classifier = classifier;
-	}
-	inline QString classifier() const
-	{
-		return m_classifier;
-	}
-	inline QString extension() const
-	{
-		return m_extension;
-	}
-	inline QString artifactPrefix() const
-	{
-		return m_groupId + ":" + m_artifactId;
-	}
-	bool matchName(const GradleSpecifier & other) const
-	{
-		return other.artifactId() == artifactId() && other.groupId() == groupId();
-	}
-	bool operator==(const GradleSpecifier & other) const
-	{
-		if(m_groupId != other.m_groupId)
-			return false;
-		if(m_artifactId != other.m_artifactId)
-			return false;
-		if(m_version != other.m_version)
-			return false;
-		if(m_classifier != other.m_classifier)
-			return false;
-		if(m_extension != other.m_extension)
-			return false;
-		return true;
-	}
-private:
-	QString m_groupId;
-	QString m_artifactId;
-	QString m_version;
-	QString m_classifier;
-	DefaultVariable<QString> m_extension = DefaultVariable<QString>("jar");
-	bool m_valid = false;
-};
diff --git a/libraries/logic/minecraft/JarMod.h b/libraries/logic/minecraft/JarMod.h
deleted file mode 100644
index 42d05da9..00000000
--- a/libraries/logic/minecraft/JarMod.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <QString>
-#include <QJsonObject>
-#include <memory>
-class Jarmod;
-typedef std::shared_ptr<Jarmod> JarmodPtr;
-class Jarmod
-{
-public: /* data */
-	QString name;
-	QString originalName;
-};
diff --git a/libraries/logic/minecraft/Library.cpp b/libraries/logic/minecraft/Library.cpp
deleted file mode 100644
index 922db84e..00000000
--- a/libraries/logic/minecraft/Library.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-#include "Library.h"
-#include <net/CacheDownload.h>
-#include <minecraft/forge/ForgeXzDownload.h>
-#include <Env.h>
-#include <FileSystem.h>
-
-void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& native, QStringList& native32, QStringList& native64) const
-{
-	auto actualPath = [&](QString relPath)
-	{
-		QFileInfo out(FS::PathCombine(storagePrefix(), relPath));
-		return out.absoluteFilePath();
-	};
-	if(m_mojangDownloads)
-	{
-		if(m_mojangDownloads->artifact)
-		{
-			auto artifact = m_mojangDownloads->artifact;
-			jar += actualPath(artifact->path);
-		}
-		if(!isNative())
-			return;
-		if(m_nativeClassifiers.contains(system))
-		{
-			auto nativeClassifier = m_nativeClassifiers[system];
-			if(nativeClassifier.contains("${arch}"))
-			{
-				auto nat32Classifier = nativeClassifier;
-				nat32Classifier.replace("${arch}", "32");
-				auto nat64Classifier = nativeClassifier;
-				nat64Classifier.replace("${arch}", "64");
-				auto nat32info = m_mojangDownloads->getDownloadInfo(nat32Classifier);
-				if(nat32info)
-					native32 += actualPath(nat32info->path);
-				auto nat64info = m_mojangDownloads->getDownloadInfo(nat64Classifier);
-				if(nat64info)
-					native64 += actualPath(nat64info->path);
-			}
-			else
-			{
-				native += actualPath(m_mojangDownloads->getDownloadInfo(nativeClassifier)->path);
-			}
-		}
-	}
-	else
-	{
-		QString raw_storage = storageSuffix(system);
-		if(isNative())
-		{
-			if (raw_storage.contains("${arch}"))
-			{
-				auto nat32Storage = raw_storage;
-				nat32Storage.replace("${arch}", "32");
-				auto nat64Storage = raw_storage;
-				nat64Storage.replace("${arch}", "64");
-				native32 += actualPath(nat32Storage);
-				native64 += actualPath(nat64Storage);
-			}
-			else
-			{
-				native += actualPath(raw_storage);
-			}
-		}
-		else
-		{
-			jar += actualPath(raw_storage);
-		}
-	}
-}
-
-QList<NetActionPtr> Library::getDownloads(OpSys system, HttpMetaCache * cache, QStringList &failedFiles) const
-{
-	QList<NetActionPtr> out;
-	bool isLocal = (hint() == "local");
-	bool isForge = (hint() == "forge-pack-xz");
-
-	auto add_download = [&](QString storage, QString dl)
-	{
-		auto entry = cache->resolveEntry("libraries", storage);
-		if (!entry->isStale())
-			return true;
-		if(isLocal)
-		{
-			QFileInfo fileinfo(entry->getFullPath());
-			if(!fileinfo.exists())
-			{
-				failedFiles.append(entry->getFullPath());
-				return false;
-			}
-			return true;
-		}
-		if (isForge)
-		{
-			out.append(ForgeXzDownload::make(storage, entry));
-		}
-		else
-		{
-			out.append(CacheDownload::make(dl, entry));
-		}
-		return true;
-	};
-
-	if(m_mojangDownloads)
-	{
-		if(m_mojangDownloads->artifact)
-		{
-			auto artifact = m_mojangDownloads->artifact;
-			add_download(artifact->path, artifact->url);
-		}
-		if(m_nativeClassifiers.contains(system))
-		{
-			auto nativeClassifier = m_nativeClassifiers[system];
-			if(nativeClassifier.contains("${arch}"))
-			{
-				auto nat32Classifier = nativeClassifier;
-				nat32Classifier.replace("${arch}", "32");
-				auto nat64Classifier = nativeClassifier;
-				nat64Classifier.replace("${arch}", "64");
-				auto nat32info = m_mojangDownloads->getDownloadInfo(nat32Classifier);
-				if(nat32info)
-					add_download(nat32info->path, nat32info->url);
-				auto nat64info = m_mojangDownloads->getDownloadInfo(nat64Classifier);
-				if(nat64info)
-					add_download(nat64info->path, nat64info->url);
-			}
-			else
-			{
-				auto info = m_mojangDownloads->getDownloadInfo(nativeClassifier);
-				if(info)
-				{
-					add_download(info->path, info->url);
-				}
-			}
-		}
-	}
-	else
-	{
-		QString raw_storage = storageSuffix(system);
-		auto raw_dl = [&](){
-			if (!m_absoluteURL.isEmpty())
-			{
-				return m_absoluteURL;
-			}
-
-			if (m_repositoryURL.isEmpty())
-			{
-				return QString("https://" + URLConstants::LIBRARY_BASE) + raw_storage;
-			}
-
-			if(m_repositoryURL.endsWith('/'))
-			{
-				return m_repositoryURL + raw_storage;
-			}
-			else
-			{
-				return m_repositoryURL + QChar('/') + raw_storage;
-			}
-		}();
-		if (raw_storage.contains("${arch}"))
-		{
-			QString cooked_storage = raw_storage;
-			QString cooked_dl = raw_dl;
-			add_download(cooked_storage.replace("${arch}", "32"), cooked_dl.replace("${arch}", "32"));
-			cooked_storage = raw_storage;
-			cooked_dl = raw_dl;
-			add_download(cooked_storage.replace("${arch}", "64"), cooked_dl.replace("${arch}", "64"));
-		}
-		else
-		{
-			add_download(raw_storage, raw_dl);
-		}
-	}
-	return out;
-}
-
-bool Library::isActive() const
-{
-	bool result = true;
-	if (m_rules.empty())
-	{
-		result = true;
-	}
-	else
-	{
-		RuleAction ruleResult = Disallow;
-		for (auto rule : m_rules)
-		{
-			RuleAction temp = rule->apply(this);
-			if (temp != Defer)
-				ruleResult = temp;
-		}
-		result = result && (ruleResult == Allow);
-	}
-	if (isNative())
-	{
-		result = result && m_nativeClassifiers.contains(currentSystem);
-	}
-	return result;
-}
-
-void Library::setStoragePrefix(QString prefix)
-{
-	m_storagePrefix = prefix;
-}
-
-QString Library::defaultStoragePrefix()
-{
-	return "libraries/";
-}
-
-QString Library::storagePrefix() const
-{
-	if(m_storagePrefix.isEmpty())
-	{
-		return defaultStoragePrefix();
-	}
-	return m_storagePrefix;
-}
-
-QString Library::storageSuffix(OpSys system) const
-{
-	// non-native? use only the gradle specifier
-	if (!isNative())
-	{
-		return m_name.toPath();
-	}
-
-	// otherwise native, override classifiers. Mojang HACK!
-	GradleSpecifier nativeSpec = m_name;
-	if (m_nativeClassifiers.contains(system))
-	{
-		nativeSpec.setClassifier(m_nativeClassifiers[system]);
-	}
-	else
-	{
-		nativeSpec.setClassifier("INVALID");
-	}
-	return nativeSpec.toPath();
-}
diff --git a/libraries/logic/minecraft/Library.h b/libraries/logic/minecraft/Library.h
deleted file mode 100644
index fdce93f3..00000000
--- a/libraries/logic/minecraft/Library.h
+++ /dev/null
@@ -1,184 +0,0 @@
-#pragma once
-#include <QString>
-#include <net/NetAction.h>
-#include <QPair>
-#include <QList>
-#include <QStringList>
-#include <QMap>
-#include <QDir>
-#include <QUrl>
-#include <memory>
-
-#include "Rule.h"
-#include "minecraft/OpSys.h"
-#include "GradleSpecifier.h"
-#include "net/URLConstants.h"
-#include "MojangDownloadInfo.h"
-
-#include "multimc_logic_export.h"
-
-class Library;
-
-typedef std::shared_ptr<Library> LibraryPtr;
-
-class MULTIMC_LOGIC_EXPORT Library
-{
-	friend class OneSixVersionFormat;
-	friend class MojangVersionFormat;
-	friend class LibraryTest;
-public:
-	Library()
-	{
-	}
-	Library(const QString &name)
-	{
-		m_name = name;
-	}
-	/// limited copy without some data. TODO: why?
-	static LibraryPtr limitedCopy(LibraryPtr base)
-	{
-		auto newlib = std::make_shared<Library>();
-		newlib->m_name = base->m_name;
-		newlib->m_repositoryURL = base->m_repositoryURL;
-		newlib->m_hint = base->m_hint;
-		newlib->m_absoluteURL = base->m_absoluteURL;
-		newlib->m_extractExcludes = base->m_extractExcludes;
-		newlib->m_nativeClassifiers = base->m_nativeClassifiers;
-		newlib->m_rules = base->m_rules;
-		newlib->m_storagePrefix = base->m_storagePrefix;
-		newlib->m_mojangDownloads = base->m_mojangDownloads;
-		return newlib;
-	}
-
-public: /* methods */
-	/// Returns the raw name field
-	const GradleSpecifier & rawName() const
-	{
-		return m_name;
-	}
-
-	void setRawName(const GradleSpecifier & spec)
-	{
-		m_name = spec;
-	}
-
-	void setClassifier(const QString & spec)
-	{
-		m_name.setClassifier(spec);
-	}
-
-	/// returns the full group and artifact prefix
-	QString artifactPrefix() const
-	{
-		return m_name.artifactPrefix();
-	}
-
-	/// get the artifact ID
-	QString artifactId() const
-	{
-		return m_name.artifactId();
-	}
-
-	/// get the artifact version
-	QString version() const
-	{
-		return m_name.version();
-	}
-
-	/// Returns true if the library is native
-	bool isNative() const
-	{
-		return m_nativeClassifiers.size() != 0;
-	}
-
-	void setStoragePrefix(QString prefix = QString());
-
-	/// Set the url base for downloads
-	void setRepositoryURL(const QString &base_url)
-	{
-		m_repositoryURL = base_url;
-	}
-
-	void getApplicableFiles(OpSys system, QStringList & jar, QStringList & native, QStringList & native32, QStringList & native64) const;
-
-	void setAbsoluteUrl(const QString &absolute_url)
-	{
-		m_absoluteURL = absolute_url;
-	}
-
-	void setMojangDownloadInfo(MojangLibraryDownloadInfo::Ptr info)
-	{
-		m_mojangDownloads = info;
-	}
-
-	void setHint(const QString &hint)
-	{
-		m_hint = hint;
-	}
-
-	/// Set the load rules
-	void setRules(QList<std::shared_ptr<Rule>> rules)
-	{
-		m_rules = rules;
-	}
-
-	/// Returns true if the library should be loaded (or extracted, in case of natives)
-	bool isActive() const;
-
-	// Get a list of downloads for this library
-	QList<NetActionPtr> getDownloads(OpSys system, class HttpMetaCache * cache, QStringList &failedFiles) const;
-
-private: /* methods */
-	/// the default storage prefix used by MultiMC
-	static QString defaultStoragePrefix();
-
-	/// Get the prefix - root of the storage to be used
-	QString storagePrefix() const;
-
-	/// Get the relative path where the library should be saved
-	QString storageSuffix(OpSys system) const;
-
-	QString hint() const
-	{
-		return m_hint;
-	}
-
-protected: /* data */
-	/// the basic gradle dependency specifier.
-	GradleSpecifier m_name;
-
-	/// DEPRECATED URL prefix of the maven repo where the file can be downloaded
-	QString m_repositoryURL;
-
-	/// DEPRECATED: MultiMC-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
-	QString m_absoluteURL;
-
-	/**
-	 * MultiMC-specific type hint - modifies how the library is treated
-	 */
-	QString m_hint;
-
-	/**
-	 * storage - by default the local libraries folder in multimc, but could be elsewhere
-	 * MultiMC specific, because of FTB.
-	 */
-	QString m_storagePrefix;
-
-	/// true if the library had an extract/excludes section (even empty)
-	bool m_hasExcludes = false;
-
-	/// a list of files that shouldn't be extracted from the library
-	QStringList m_extractExcludes;
-
-	/// native suffixes per OS
-	QMap<OpSys, QString> m_nativeClassifiers;
-
-	/// true if the library had a rules section (even empty)
-	bool applyRules = false;
-
-	/// rules associated with the library
-	QList<std::shared_ptr<Rule>> m_rules;
-
-	/// MOJANG: container with Mojang style download info
-	MojangLibraryDownloadInfo::Ptr m_mojangDownloads;
-};
diff --git a/libraries/logic/minecraft/MinecraftInstance.cpp b/libraries/logic/minecraft/MinecraftInstance.cpp
deleted file mode 100644
index 405ccd26..00000000
--- a/libraries/logic/minecraft/MinecraftInstance.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-#include "MinecraftInstance.h"
-#include <settings/Setting.h>
-#include "settings/SettingsObject.h"
-#include "Env.h"
-#include "minecraft/MinecraftVersionList.h"
-#include <MMCStrings.h>
-#include <pathmatcher/RegexpMatcher.h>
-#include <pathmatcher/MultiMatcher.h>
-#include <FileSystem.h>
-#include <java/JavaVersion.h>
-
-#define IBUS "@im=ibus"
-
-// all of this because keeping things compatible with deprecated old settings
-// if either of the settings {a, b} is true, this also resolves to true
-class OrSetting : public Setting
-{
-	Q_OBJECT
-public:
-	OrSetting(QString id, std::shared_ptr<Setting> a, std::shared_ptr<Setting> b)
-	:Setting({id}, false), m_a(a), m_b(b)
-	{
-	}
-	virtual QVariant get() const
-	{
-		bool a = m_a->get().toBool();
-		bool b = m_b->get().toBool();
-		return a || b;
-	}
-	virtual void reset() {}
-	virtual void set(QVariant value) {}
-private:
-	std::shared_ptr<Setting> m_a;
-	std::shared_ptr<Setting> m_b;
-};
-
-MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: BaseInstance(globalSettings, settings, rootDir)
-{
-	// Java Settings
-	auto javaOverride = m_settings->registerSetting("OverrideJava", false);
-	auto locationOverride = m_settings->registerSetting("OverrideJavaLocation", false);
-	auto argsOverride = m_settings->registerSetting("OverrideJavaArgs", false);
-
-	// combinations
-	auto javaOrLocation = std::make_shared<OrSetting>("JavaOrLocationOverride", javaOverride, locationOverride);
-	auto javaOrArgs = std::make_shared<OrSetting>("JavaOrArgsOverride", javaOverride, argsOverride);
-
-	m_settings->registerOverride(globalSettings->getSetting("JavaPath"), javaOrLocation);
-	m_settings->registerOverride(globalSettings->getSetting("JvmArgs"), javaOrArgs);
-
-	// special!
-	m_settings->registerPassthrough(globalSettings->getSetting("JavaTimestamp"), javaOrLocation);
-	m_settings->registerPassthrough(globalSettings->getSetting("JavaVersion"), javaOrLocation);
-
-	// Window Size
-	auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
-	m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized"), windowSetting);
-	m_settings->registerOverride(globalSettings->getSetting("MinecraftWinWidth"), windowSetting);
-	m_settings->registerOverride(globalSettings->getSetting("MinecraftWinHeight"), windowSetting);
-
-	// Memory
-	auto memorySetting = m_settings->registerSetting("OverrideMemory", false);
-	m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc"), memorySetting);
-	m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc"), memorySetting);
-	m_settings->registerOverride(globalSettings->getSetting("PermGen"), memorySetting);
-}
-
-QString MinecraftInstance::minecraftRoot() const
-{
-	QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
-	QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
-
-	if (dotMCDir.exists() && !mcDir.exists())
-		return dotMCDir.filePath();
-	else
-		return mcDir.filePath();
-}
-
-std::shared_ptr< BaseVersionList > MinecraftInstance::versionList() const
-{
-	return ENV.getVersionList("net.minecraft");
-}
-
-QStringList MinecraftInstance::javaArguments() const
-{
-	QStringList args;
-
-	// custom args go first. we want to override them if we have our own here.
-	args.append(extraArguments());
-
-	// OSX dock icon and name
-#ifdef Q_OS_MAC
-	args << "-Xdock:icon=icon.png";
-	args << QString("-Xdock:name=\"%1\"").arg(windowTitle());
-#endif
-
-	// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767
-#ifdef Q_OS_WIN32
-	args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_"
-					"minecraft.exe.heapdump");
-#endif
-
-	args << QString("-Xms%1m").arg(settings()->get("MinMemAlloc").toInt());
-	args << QString("-Xmx%1m").arg(settings()->get("MaxMemAlloc").toInt());
-
-	// No PermGen in newer java.
-	JavaVersion javaVersion(settings()->get("JavaVersion").toString());
-	if(javaVersion.requiresPermGen())
-	{
-		auto permgen = settings()->get("PermGen").toInt();
-		if (permgen != 64)
-		{
-			args << QString("-XX:PermSize=%1m").arg(permgen);
-		}
-	}
-
-	args << "-Duser.language=en";
-	args << "-jar" << FS::PathCombine(QCoreApplication::applicationDirPath(), "jars", "NewLaunch.jar");
-
-	return args;
-}
-
-QMap<QString, QString> MinecraftInstance::getVariables() const
-{
-	QMap<QString, QString> out;
-	out.insert("INST_NAME", name());
-	out.insert("INST_ID", id());
-	out.insert("INST_DIR", QDir(instanceRoot()).absolutePath());
-	out.insert("INST_MC_DIR", QDir(minecraftRoot()).absolutePath());
-	out.insert("INST_JAVA", settings()->get("JavaPath").toString());
-	out.insert("INST_JAVA_ARGS", javaArguments().join(' '));
-	return out;
-}
-
-static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
-{
-	QDir mmcBin(QCoreApplication::applicationDirPath());
-	auto items = LD_LIBRARY_PATH.split(':');
-	QStringList final;
-	for(auto & item: items)
-	{
-		QDir test(item);
-		if(test == mmcBin)
-		{
-			qDebug() << "Env:LD_LIBRARY_PATH ignoring path" << item;
-			continue;
-		}
-		final.append(item);
-	}
-	return final.join(':');
-}
-
-QProcessEnvironment MinecraftInstance::createEnvironment()
-{
-	// prepare the process environment
-	QProcessEnvironment rawenv = QProcessEnvironment::systemEnvironment();
-	QProcessEnvironment env;
-
-	QStringList ignored =
-	{
-		"JAVA_ARGS",
-		"CLASSPATH",
-		"CONFIGPATH",
-		"JAVA_HOME",
-		"JRE_HOME",
-		"_JAVA_OPTIONS",
-		"JAVA_OPTIONS",
-		"JAVA_TOOL_OPTIONS"
-	};
-	for(auto key: rawenv.keys())
-	{
-		auto value = rawenv.value(key);
-		// filter out dangerous java crap
-		if(ignored.contains(key))
-		{
-			qDebug() << "Env: ignoring" << key << value;
-			continue;
-		}
-		// filter MultiMC-related things
-		if(key.startsWith("QT_"))
-		{
-			qDebug() << "Env: ignoring" << key << value;
-			continue;
-		}
-#ifdef Q_OS_LINUX
-		// Do not pass LD_* variables to java. They were intended for MultiMC
-		if(key.startsWith("LD_"))
-		{
-			qDebug() << "Env: ignoring" << key << value;
-			continue;
-		}
-		// Strip IBus
-		// IBus is a Linux IME framework. For some reason, it breaks MC?
-		if (key == "XMODIFIERS" && value.contains(IBUS))
-		{
-			QString save = value;
-			value.replace(IBUS, "");
-			qDebug() << "Env: stripped" << IBUS << "from" << save << ":" << value;
-		}
-		if(key == "GAME_PRELOAD")
-		{
-			env.insert("LD_PRELOAD", value);
-			continue;
-		}
-		if(key == "GAME_LIBRARY_PATH")
-		{
-			env.insert("LD_LIBRARY_PATH", processLD_LIBRARY_PATH(value));
-			continue;
-		}
-#endif
-		qDebug() << "Env: " << key << value;
-		env.insert(key, value);
-	}
-#ifdef Q_OS_LINUX
-	// HACK: Workaround for QTBUG42500
-	if(!env.contains("LD_LIBRARY_PATH"))
-	{
-		env.insert("LD_LIBRARY_PATH", "");
-	}
-#endif
-
-	// export some infos
-	auto variables = getVariables();
-	for (auto it = variables.begin(); it != variables.end(); ++it)
-	{
-		env.insert(it.key(), it.value());
-	}
-	return env;
-}
-
-QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSessionPtr session)
-{
-	if(!session)
-	{
-		return QMap<QString, QString>();
-	}
-	auto & sessionRef = *session.get();
-	QMap<QString, QString> filter;
-	auto addToFilter = [&filter](QString key, QString value)
-	{
-		if(key.trimmed().size())
-		{
-			filter[key] = value;
-		}
-	};
-	if (sessionRef.session != "-")
-	{
-		addToFilter(sessionRef.session, tr("<SESSION ID>"));
-	}
-	addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
-	addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>"));
-	addToFilter(sessionRef.uuid, tr("<PROFILE ID>"));
-	addToFilter(sessionRef.player_name, tr("<PROFILE NAME>"));
-
-	auto i = sessionRef.u.properties.begin();
-	while (i != sessionRef.u.properties.end())
-	{
-		addToFilter(i.value(), "<" + i.key().toUpper() + ">");
-		++i;
-	}
-	return filter;
-}
-
-MessageLevel::Enum MinecraftInstance::guessLevel(const QString &line, MessageLevel::Enum level)
-{
-	QRegularExpression re("\\[(?<timestamp>[0-9:]+)\\] \\[[^/]+/(?<level>[^\\]]+)\\]");
-	auto match = re.match(line);
-	if(match.hasMatch())
-	{
-		// New style logs from log4j
-		QString timestamp = match.captured("timestamp");
-		QString levelStr = match.captured("level");
-		if(levelStr == "INFO")
-			level = MessageLevel::Message;
-		if(levelStr == "WARN")
-			level = MessageLevel::Warning;
-		if(levelStr == "ERROR")
-			level = MessageLevel::Error;
-		if(levelStr == "FATAL")
-			level = MessageLevel::Fatal;
-		if(levelStr == "TRACE" || levelStr == "DEBUG")
-			level = MessageLevel::Debug;
-	}
-	else
-	{
-		// Old style forge logs
-		if (line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") ||
-			line.contains("[FINER]") || line.contains("[FINEST]"))
-			level = MessageLevel::Message;
-		if (line.contains("[SEVERE]") || line.contains("[STDERR]"))
-			level = MessageLevel::Error;
-		if (line.contains("[WARNING]"))
-			level = MessageLevel::Warning;
-		if (line.contains("[DEBUG]"))
-			level = MessageLevel::Debug;
-	}
-	if (line.contains("overwriting existing"))
-		return MessageLevel::Fatal;
-	//NOTE: this diverges from the real regexp. no unicode, the first section is + instead of *
-	static const QString javaSymbol = "([a-zA-Z_$][a-zA-Z\\d_$]*\\.)+[a-zA-Z_$][a-zA-Z\\d_$]*";
-	if (line.contains("Exception in thread")
-		|| line.contains(QRegularExpression("\\s+at " + javaSymbol))
-		|| line.contains(QRegularExpression("Caused by: " + javaSymbol))
-		|| line.contains(QRegularExpression("([a-zA-Z_$][a-zA-Z\\d_$]*\\.)+[a-zA-Z_$]?[a-zA-Z\\d_$]*(Exception|Error|Throwable)"))
-		|| line.contains(QRegularExpression("... \\d+ more$"))
-		)
-		return MessageLevel::Error;
-	return level;
-}
-
-IPathMatcher::Ptr MinecraftInstance::getLogFileMatcher()
-{
-	auto combined = std::make_shared<MultiMatcher>();
-	combined->add(std::make_shared<RegexpMatcher>(".*\\.log(\\.[0-9]*)?(\\.gz)?$"));
-	combined->add(std::make_shared<RegexpMatcher>("crash-.*\\.txt"));
-	combined->add(std::make_shared<RegexpMatcher>("IDMap dump.*\\.txt$"));
-	combined->add(std::make_shared<RegexpMatcher>("ModLoader\\.txt(\\..*)?$"));
-	return combined;
-}
-
-QString MinecraftInstance::getLogFileRoot()
-{
-	return minecraftRoot();
-}
-
-QString MinecraftInstance::prettifyTimeDuration(int64_t duration)
-{
-	int seconds = (int) (duration % 60);
-	duration /= 60;
-	int minutes = (int) (duration % 60);
-	duration /= 60;
-	int hours = (int) (duration % 24);
-	int days = (int) (duration / 24);
-	if((hours == 0)&&(days == 0))
-	{
-		return tr("%1m %2s").arg(minutes).arg(seconds);
-	}
-	if (days == 0)
-	{
-		return tr("%1h %2m").arg(hours).arg(minutes);
-	}
-	return tr("%1d %2h %3m").arg(days).arg(hours).arg(minutes);
-}
-
-QString MinecraftInstance::getStatusbarDescription()
-{
-	QStringList traits;
-	if (flags() & VersionBrokenFlag)
-	{
-		traits.append(tr("broken"));
-	}
-
-	QString description;
-	description.append(tr("Minecraft %1 (%2)").arg(intendedVersionId()).arg(typeName()));
-	if(totalTimePlayed() > 0)
-	{
-		description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed())));
-	}
-	/*
-	if(traits.size())
-	{
-		description.append(QString(" (%1)").arg(traits.join(", ")));
-	}
-	*/
-	return description;
-}
-
-#include "MinecraftInstance.moc"
diff --git a/libraries/logic/minecraft/MinecraftInstance.h b/libraries/logic/minecraft/MinecraftInstance.h
deleted file mode 100644
index cd3a8d90..00000000
--- a/libraries/logic/minecraft/MinecraftInstance.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-#include "BaseInstance.h"
-#include "minecraft/Mod.h"
-#include <QProcess>
-
-#include "multimc_logic_export.h"
-
-class ModList;
-class WorldList;
-
-class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
-{
-public:
-	MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-	virtual ~MinecraftInstance() {};
-
-	/// Path to the instance's minecraft directory.
-	QString minecraftRoot() const;
-
-	//////  Mod Lists  //////
-	virtual std::shared_ptr<ModList> resourcePackList() const
-	{
-		return nullptr;
-	}
-	virtual std::shared_ptr<ModList> texturePackList() const
-	{
-		return nullptr;
-	}
-	virtual std::shared_ptr<WorldList> worldList() const
-	{
-		return nullptr;
-	}
-	/// get all jar mods applicable to this instance's jar
-	virtual QList<Mod> getJarMods() const
-	{
-		return QList<Mod>();
-	}
-
-	/// get the launch script to be used with this 
-	virtual QString createLaunchScript(AuthSessionPtr session) = 0;
-
-	//FIXME: nuke?
-	virtual std::shared_ptr<BaseVersionList> versionList() const override;
-
-	/// get arguments passed to java
-	QStringList javaArguments() const;
-
-	/// get variables for launch command variable substitution/environment
-	virtual QMap<QString, QString> getVariables() const override;
-
-	/// create an environment for launching processes
-	virtual QProcessEnvironment createEnvironment() override;
-
-	/// guess log level from a line of minecraft log
-	virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level) override;
-
-	virtual IPathMatcher::Ptr getLogFileMatcher() override;
-
-	virtual QString getLogFileRoot() override;
-
-	virtual QString getStatusbarDescription() override;
-
-protected:
-	QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
-private:
-	QString prettifyTimeDuration(int64_t duration);
-};
-
-typedef std::shared_ptr<MinecraftInstance> MinecraftInstancePtr;
diff --git a/libraries/logic/minecraft/MinecraftProfile.cpp b/libraries/logic/minecraft/MinecraftProfile.cpp
deleted file mode 100644
index 70d0cee4..00000000
--- a/libraries/logic/minecraft/MinecraftProfile.cpp
+++ /dev/null
@@ -1,610 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QFile>
-#include <QCryptographicHash>
-#include <Version.h>
-#include <QDir>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QDebug>
-
-#include "minecraft/MinecraftProfile.h"
-#include "ProfileUtils.h"
-#include "ProfileStrategy.h"
-#include "Exception.h"
-
-MinecraftProfile::MinecraftProfile(ProfileStrategy *strategy)
-	: QAbstractListModel()
-{
-	setStrategy(strategy);
-	clear();
-}
-
-void MinecraftProfile::setStrategy(ProfileStrategy* strategy)
-{
-	Q_ASSERT(strategy != nullptr);
-
-	if(m_strategy != nullptr)
-	{
-		delete m_strategy;
-		m_strategy = nullptr;
-	}
-	m_strategy = strategy;
-	m_strategy->profile = this;
-}
-
-ProfileStrategy* MinecraftProfile::strategy()
-{
-	return m_strategy;
-}
-
-void MinecraftProfile::reload()
-{
-	beginResetModel();
-	m_strategy->load();
-	reapplyPatches();
-	endResetModel();
-}
-
-void MinecraftProfile::clear()
-{
-	m_minecraftVersion.clear();
-	m_minecraftVersionType.clear();
-	m_minecraftAssets.reset();
-	m_minecraftArguments.clear();
-	m_tweakers.clear();
-	m_mainClass.clear();
-	m_appletClass.clear();
-	m_libraries.clear();
-	m_traits.clear();
-	m_jarMods.clear();
-	mojangDownloads.clear();
-	m_problemSeverity = ProblemSeverity::PROBLEM_NONE;
-}
-
-void MinecraftProfile::clearPatches()
-{
-	beginResetModel();
-	m_patches.clear();
-	endResetModel();
-}
-
-void MinecraftProfile::appendPatch(ProfilePatchPtr patch)
-{
-	int index = m_patches.size();
-	beginInsertRows(QModelIndex(), index, index);
-	m_patches.append(patch);
-	endInsertRows();
-}
-
-bool MinecraftProfile::remove(const int index)
-{
-	auto patch = versionPatch(index);
-	if (!patch->isRemovable())
-	{
-		qDebug() << "Patch" << patch->getID() << "is non-removable";
-		return false;
-	}
-
-	if(!m_strategy->removePatch(patch))
-	{
-		qCritical() << "Patch" << patch->getID() << "could not be removed";
-		return false;
-	}
-
-	beginRemoveRows(QModelIndex(), index, index);
-	m_patches.removeAt(index);
-	endRemoveRows();
-	reapplyPatches();
-	saveCurrentOrder();
-	return true;
-}
-
-bool MinecraftProfile::remove(const QString id)
-{
-	int i = 0;
-	for (auto patch : m_patches)
-	{
-		if (patch->getID() == id)
-		{
-			return remove(i);
-		}
-		i++;
-	}
-	return false;
-}
-
-bool MinecraftProfile::customize(int index)
-{
-	auto patch = versionPatch(index);
-	if (!patch->isCustomizable())
-	{
-		qDebug() << "Patch" << patch->getID() << "is not customizable";
-		return false;
-	}
-	if(!m_strategy->customizePatch(patch))
-	{
-		qCritical() << "Patch" << patch->getID() << "could not be customized";
-		return false;
-	}
-	reapplyPatches();
-	saveCurrentOrder();
-	// FIXME: maybe later in unstable
-	// emit dataChanged(createIndex(index, 0), createIndex(index, columnCount(QModelIndex()) - 1));
-	return true;
-}
-
-bool MinecraftProfile::revertToBase(int index)
-{
-	auto patch = versionPatch(index);
-	if (!patch->isRevertible())
-	{
-		qDebug() << "Patch" << patch->getID() << "is not revertible";
-		return false;
-	}
-	if(!m_strategy->revertPatch(patch))
-	{
-		qCritical() << "Patch" << patch->getID() << "could not be reverted";
-		return false;
-	}
-	reapplyPatches();
-	saveCurrentOrder();
-	// FIXME: maybe later in unstable
-	// emit dataChanged(createIndex(index, 0), createIndex(index, columnCount(QModelIndex()) - 1));
-	return true;
-}
-
-ProfilePatchPtr MinecraftProfile::versionPatch(const QString &id)
-{
-	for (auto file : m_patches)
-	{
-		if (file->getID() == id)
-		{
-			return file;
-		}
-	}
-	return nullptr;
-}
-
-ProfilePatchPtr MinecraftProfile::versionPatch(int index)
-{
-	if(index < 0 || index >= m_patches.size())
-		return nullptr;
-	return m_patches[index];
-}
-
-bool MinecraftProfile::isVanilla()
-{
-	for(auto patchptr: m_patches)
-	{
-		if(patchptr->isCustom())
-			return false;
-	}
-	return true;
-}
-
-bool MinecraftProfile::revertToVanilla()
-{
-	// remove patches, if present
-	auto VersionPatchesCopy = m_patches;
-	for(auto & it: VersionPatchesCopy)
-	{
-		if (!it->isCustom())
-		{
-			continue;
-		}
-		if(it->isRevertible() || it->isRemovable())
-		{
-			if(!remove(it->getID()))
-			{
-				qWarning() << "Couldn't remove" << it->getID() << "from profile!";
-				reapplyPatches();
-				saveCurrentOrder();
-				return false;
-			}
-		}
-	}
-	reapplyPatches();
-	saveCurrentOrder();
-	return true;
-}
-
-QVariant MinecraftProfile::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	int row = index.row();
-	int column = index.column();
-
-	if (row < 0 || row >= m_patches.size())
-		return QVariant();
-
-	auto patch = m_patches.at(row);
-
-	if (role == Qt::DisplayRole)
-	{
-		switch (column)
-		{
-		case 0:
-			return m_patches.at(row)->getName();
-		case 1:
-		{
-			if(patch->isCustom())
-			{
-				return QString("%1 (Custom)").arg(patch->getVersion());
-			}
-			else
-			{
-				return patch->getVersion();
-			}
-		}
-		default:
-			return QVariant();
-		}
-	}
-	if(role == Qt::DecorationRole)
-	{
-		switch(column)
-		{
-		case 0:
-		{
-			auto severity = patch->getProblemSeverity();
-			switch (severity)
-			{
-				case PROBLEM_WARNING:
-					return "warning";
-				case PROBLEM_ERROR:
-					return "error";
-				default:
-					return QVariant();
-			}
-		}
-		default:
-		{
-			return QVariant();
-		}
-		}
-	}
-	return QVariant();
-}
-QVariant MinecraftProfile::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (orientation == Qt::Horizontal)
-	{
-		if (role == Qt::DisplayRole)
-		{
-			switch (section)
-			{
-			case 0:
-				return tr("Name");
-			case 1:
-				return tr("Version");
-			default:
-				return QVariant();
-			}
-		}
-	}
-	return QVariant();
-}
-Qt::ItemFlags MinecraftProfile::flags(const QModelIndex &index) const
-{
-	if (!index.isValid())
-		return Qt::NoItemFlags;
-	return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-}
-
-int MinecraftProfile::rowCount(const QModelIndex &parent) const
-{
-	return m_patches.size();
-}
-
-int MinecraftProfile::columnCount(const QModelIndex &parent) const
-{
-	return 2;
-}
-
-void MinecraftProfile::saveCurrentOrder() const
-{
-	ProfileUtils::PatchOrder order;
-	for(auto item: m_patches)
-	{
-		if(!item->isMoveable())
-			continue;
-		order.append(item->getID());
-	}
-	m_strategy->saveOrder(order);
-}
-
-void MinecraftProfile::move(const int index, const MoveDirection direction)
-{
-	int theirIndex;
-	if (direction == MoveUp)
-	{
-		theirIndex = index - 1;
-	}
-	else
-	{
-		theirIndex = index + 1;
-	}
-
-	if (index < 0 || index >= m_patches.size())
-		return;
-	if (theirIndex >= rowCount())
-		theirIndex = rowCount() - 1;
-	if (theirIndex == -1)
-		theirIndex = rowCount() - 1;
-	if (index == theirIndex)
-		return;
-	int togap = theirIndex > index ? theirIndex + 1 : theirIndex;
-
-	auto from = versionPatch(index);
-	auto to = versionPatch(theirIndex);
-
-	if (!from || !to || !to->isMoveable() || !from->isMoveable())
-	{
-		return;
-	}
-	beginMoveRows(QModelIndex(), index, index, QModelIndex(), togap);
-	m_patches.swap(index, theirIndex);
-	endMoveRows();
-	reapplyPatches();
-	saveCurrentOrder();
-}
-void MinecraftProfile::resetOrder()
-{
-	m_strategy->resetOrder();
-	reload();
-}
-
-bool MinecraftProfile::reapplyPatches()
-{
-	try
-	{
-		clear();
-		for(auto file: m_patches)
-		{
-			file->applyTo(this);
-		}
-	}
-	catch (Exception & error)
-	{
-		clear();
-		qWarning() << "Couldn't apply profile patches because: " << error.cause();
-		return false;
-	}
-	return true;
-}
-
-static void applyString(const QString & from, QString & to)
-{
-	if(from.isEmpty())
-		return;
-	to = from;
-}
-
-void MinecraftProfile::applyMinecraftVersion(const QString& id)
-{
-	applyString(id, this->m_minecraftVersion);
-}
-
-void MinecraftProfile::applyAppletClass(const QString& appletClass)
-{
-	applyString(appletClass, this->m_appletClass);
-}
-
-void MinecraftProfile::applyMainClass(const QString& mainClass)
-{
-	applyString(mainClass, this->m_mainClass);
-}
-
-void MinecraftProfile::applyMinecraftArguments(const QString& minecraftArguments)
-{
-	applyString(minecraftArguments, this->m_minecraftArguments);
-}
-
-void MinecraftProfile::applyMinecraftVersionType(const QString& type)
-{
-	applyString(type, this->m_minecraftVersionType);
-}
-
-void MinecraftProfile::applyMinecraftAssets(MojangAssetIndexInfo::Ptr assets)
-{
-	if(assets)
-	{
-		m_minecraftAssets = assets;
-	}
-}
-
-void MinecraftProfile::applyMojangDownload(const QString &key, MojangDownloadInfo::Ptr download)
-{
-	if(download)
-	{
-		mojangDownloads[key] = download;
-	}
-	else
-	{
-		mojangDownloads.remove(key);
-	}
-}
-
-void MinecraftProfile::applyTraits(const QSet<QString>& traits)
-{
-	this->m_traits.unite(traits);
-}
-
-void MinecraftProfile::applyTweakers(const QStringList& tweakers)
-{
-	// FIXME: check for dupes?
-	// FIXME: does order matter?
-	for (auto tweaker : tweakers)
-	{
-		this->m_tweakers += tweaker;
-	}
-}
-
-void MinecraftProfile::applyJarMods(const QList<JarmodPtr>& jarMods)
-{
-	this->m_jarMods.append(jarMods);
-}
-
-static int findLibraryByName(QList<LibraryPtr> haystack, const GradleSpecifier &needle)
-{
-	int retval = -1;
-	for (int i = 0; i < haystack.size(); ++i)
-	{
-		if (haystack.at(i)->rawName().matchName(needle))
-		{
-			// only one is allowed.
-			if (retval != -1)
-				return -1;
-			retval = i;
-		}
-	}
-	return retval;
-}
-
-void MinecraftProfile::applyLibrary(LibraryPtr library)
-{
-	if(!library->isActive())
-	{
-		return;
-	}
-	// find the library by name.
-	const int index = findLibraryByName(m_libraries, library->rawName());
-	// library not found? just add it.
-	if (index < 0)
-	{
-		m_libraries.append(Library::limitedCopy(library));
-		return;
-	}
-	auto existingLibrary = m_libraries.at(index);
-	// if we are higher it means we should update
-	if (Version(library->version()) > Version(existingLibrary->version()))
-	{
-		auto libraryCopy = Library::limitedCopy(library);
-		m_libraries.replace(index, libraryCopy);
-	}
-}
-
-void MinecraftProfile::applyProblemSeverity(ProblemSeverity severity)
-{
-	if (m_problemSeverity < severity)
-	{
-		m_problemSeverity = severity;
-	}
-}
-
-
-QString MinecraftProfile::getMinecraftVersion() const
-{
-	return m_minecraftVersion;
-}
-
-QString MinecraftProfile::getAppletClass() const
-{
-	return m_appletClass;
-}
-
-QString MinecraftProfile::getMainClass() const
-{
-	return m_mainClass;
-}
-
-const QSet<QString> &MinecraftProfile::getTraits() const
-{
-	return m_traits;
-}
-
-const QStringList & MinecraftProfile::getTweakers() const
-{
-	return m_tweakers;
-}
-
-bool MinecraftProfile::hasTrait(const QString& trait) const
-{
-	return m_traits.contains(trait);
-}
-
-ProblemSeverity MinecraftProfile::getProblemSeverity() const
-{
-	return m_problemSeverity;
-}
-
-QString MinecraftProfile::getMinecraftVersionType() const
-{
-	return m_minecraftVersionType;
-}
-
-std::shared_ptr<MojangAssetIndexInfo> MinecraftProfile::getMinecraftAssets() const
-{
-	if(!m_minecraftAssets)
-	{
-		return std::make_shared<MojangAssetIndexInfo>("legacy");
-	}
-	return m_minecraftAssets;
-}
-
-QString MinecraftProfile::getMinecraftArguments() const
-{
-	return m_minecraftArguments;
-}
-
-const QList<JarmodPtr> & MinecraftProfile::getJarMods() const
-{
-	return m_jarMods;
-}
-
-const QList<LibraryPtr> & MinecraftProfile::getLibraries() const
-{
-	return m_libraries;
-}
-
-QString MinecraftProfile::getMainJarUrl() const
-{
-	auto iter = mojangDownloads.find("client");
-	if(iter != mojangDownloads.end())
-	{
-		// current
-		return iter.value()->url;
-	}
-	else
-	{
-		// legacy fallback
-		return URLConstants::getLegacyJarUrl(getMinecraftVersion());
-	}
-}
-
-void MinecraftProfile::installJarMods(QStringList selectedFiles)
-{
-	m_strategy->installJarMods(selectedFiles);
-}
-
-/*
- * TODO: get rid of this. Get rid of all order numbers.
- */
-int MinecraftProfile::getFreeOrderNumber()
-{
-	int largest = 100;
-	// yes, I do realize this is dumb. The order thing itself is dumb. and to be removed next.
-	for(auto thing: m_patches)
-	{
-		int order = thing->getOrder();
-		if(order > largest)
-			largest = order;
-	}
-	return largest + 1;
-}
diff --git a/libraries/logic/minecraft/MinecraftProfile.h b/libraries/logic/minecraft/MinecraftProfile.h
deleted file mode 100644
index ca9288ad..00000000
--- a/libraries/logic/minecraft/MinecraftProfile.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QAbstractListModel>
-
-#include <QString>
-#include <QList>
-#include <memory>
-
-#include "Library.h"
-#include "VersionFile.h"
-#include "JarMod.h"
-#include "MojangDownloadInfo.h"
-
-#include "multimc_logic_export.h"
-
-class ProfileStrategy;
-class OneSixInstance;
-
-
-class MULTIMC_LOGIC_EXPORT MinecraftProfile : public QAbstractListModel
-{
-	Q_OBJECT
-
-public:
-	explicit MinecraftProfile(ProfileStrategy *strategy);
-
-	void setStrategy(ProfileStrategy * strategy);
-	ProfileStrategy *strategy();
-
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-	virtual int columnCount(const QModelIndex &parent) const override;
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
-
-	/// is this version unchanged by the user?
-	bool isVanilla();
-
-	/// remove any customizations on top of whatever 'vanilla' means
-	bool revertToVanilla();
-
-	/// install more jar mods
-	void installJarMods(QStringList selectedFiles);
-
-	/// DEPRECATED, remove ASAP
-	int getFreeOrderNumber();
-
-	enum MoveDirection { MoveUp, MoveDown };
-	/// move patch file # up or down the list
-	void move(const int index, const MoveDirection direction);
-
-	/// remove patch file # - including files/records
-	bool remove(const int index);
-
-	/// remove patch file by id - including files/records
-	bool remove(const QString id);
-
-	bool customize(int index);
-
-	bool revertToBase(int index);
-
-	void resetOrder();
-
-	/// reload all profile patches from storage, clear the profile and apply the patches
-	void reload();
-
-	/// clear the profile
-	void clear();
-
-	/// apply the patches. Catches all the errors and returns true/false for success/failure
-	bool reapplyPatches();
-
-public: /* application of profile variables from patches */
-	void applyMinecraftVersion(const QString& id);
-	void applyMainClass(const QString& mainClass);
-	void applyAppletClass(const QString& appletClass);
-	void applyMinecraftArguments(const QString& minecraftArguments);
-	void applyMinecraftVersionType(const QString& type);
-	void applyMinecraftAssets(MojangAssetIndexInfo::Ptr assets);
-	void applyTraits(const QSet<QString> &traits);
-	void applyTweakers(const QStringList &tweakers);
-	void applyJarMods(const QList<JarmodPtr> &jarMods);
-	void applyLibrary(LibraryPtr library);
-	void applyProblemSeverity(ProblemSeverity severity);
-	void applyMojangDownload(const QString & key, MojangDownloadInfo::Ptr download);
-
-public: /* getters for profile variables */
-	QString getMinecraftVersion() const;
-	QString getMainClass() const;
-	QString getAppletClass() const;
-	QString getMinecraftVersionType() const;
-	MojangAssetIndexInfo::Ptr getMinecraftAssets() const;
-	QString getMinecraftArguments() const;
-	const QSet<QString> & getTraits() const;
-	const QStringList & getTweakers() const;
-	const QList<JarmodPtr> & getJarMods() const;
-	const QList<LibraryPtr> & getLibraries() const;
-	QString getMainJarUrl() const;
-	bool hasTrait(const QString & trait) const;
-	ProblemSeverity getProblemSeverity() const;
-
-public:
-	/// get the profile patch by id
-	ProfilePatchPtr versionPatch(const QString &id);
-
-	/// get the profile patch by index
-	ProfilePatchPtr versionPatch(int index);
-
-	/// save the current patch order
-	void saveCurrentOrder() const;
-
-	/// Remove all the patches
-	void clearPatches();
-
-	/// Add the patch object to the internal list of patches
-	void appendPatch(ProfilePatchPtr patch);
-
-private: /* data */
-	/// the version of Minecraft - jar to use
-	QString m_minecraftVersion;
-
-	/// Release type - "release" or "snapshot"
-	QString m_minecraftVersionType;
-
-	/// Assets type - "legacy" or a version ID
-	MojangAssetIndexInfo::Ptr m_minecraftAssets;
-
-	// Mojang: list of 'downloads' - client jar, server jar, windows server exe, maybe more.
-	QMap <QString, std::shared_ptr<MojangDownloadInfo>> mojangDownloads;
-
-	/**
-	 * arguments that should be used for launching minecraft
-	 *
-	 * ex: "--username ${auth_player_name} --session ${auth_session}
-	 *      --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets}"
-	 */
-	QString m_minecraftArguments;
-
-	/// A list of all tweaker classes
-	QStringList m_tweakers;
-
-	/// The main class to load first
-	QString m_mainClass;
-
-	/// The applet class, for some very old minecraft releases
-	QString m_appletClass;
-
-	/// the list of libraries
-	QList<LibraryPtr> m_libraries;
-
-	/// traits, collected from all the version files (version files can only add)
-	QSet<QString> m_traits;
-
-	/// A list of jar mods. version files can add those.
-	QList<JarmodPtr> m_jarMods;
-
-	ProblemSeverity m_problemSeverity = PROBLEM_NONE;
-
-	/*
-	FIXME: add support for those rules here? Looks like a pile of quick hacks to me though.
-
-	"rules": [
-		{
-		"action": "allow"
-		},
-		{
-		"action": "disallow",
-		"os": {
-			"name": "osx",
-			"version": "^10\\.5\\.\\d$"
-		}
-		}
-	],
-	"incompatibilityReason": "There is a bug in LWJGL which makes it incompatible with OSX
-	10.5.8. Please go to New Profile and use 1.5.2 for now. Sorry!"
-	}
-	*/
-	// QList<Rule> rules;
-
-	/// list of attached profile patches
-	QList<ProfilePatchPtr> m_patches;
-
-	/// strategy used for profile operations
-	ProfileStrategy *m_strategy = nullptr;
-};
diff --git a/libraries/logic/minecraft/MinecraftVersion.cpp b/libraries/logic/minecraft/MinecraftVersion.cpp
deleted file mode 100644
index 1e1d273c..00000000
--- a/libraries/logic/minecraft/MinecraftVersion.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include "MinecraftVersion.h"
-#include "MinecraftProfile.h"
-#include "VersionBuildError.h"
-#include "ProfileUtils.h"
-#include "settings/SettingsObject.h"
-#include "minecraft/VersionFilterData.h"
-
-bool MinecraftVersion::usesLegacyLauncher()
-{
-	return getReleaseDateTime() < g_VersionFilterData.legacyCutoffDate;
-}
-
-
-QString MinecraftVersion::descriptor()
-{
-	return m_version;
-}
-
-QString MinecraftVersion::name()
-{
-	return m_version;
-}
-
-QString MinecraftVersion::typeString() const
-{
-	if(m_type == "snapshot")
-	{
-		return QObject::tr("Snapshot");
-	}
-	else if (m_type == "release")
-	{
-		return QObject::tr("Regular release");
-	}
-	else if (m_type == "old_alpha")
-	{
-		return QObject::tr("Alpha");
-	}
-	else if (m_type == "old_beta")
-	{
-		return QObject::tr("Beta");
-	}
-	else
-	{
-		return QString();
-	}
-}
-
-VersionSource MinecraftVersion::getVersionSource()
-{
-	return m_versionSource;
-}
-
-bool MinecraftVersion::hasJarMods()
-{
-	return false;
-}
-
-bool MinecraftVersion::isMinecraftVersion()
-{
-	return true;
-}
-
-void MinecraftVersion::applyFileTo(MinecraftProfile *profile)
-{
-	if(m_versionSource == Local && getVersionFile())
-	{
-		getVersionFile()->applyTo(profile);
-	}
-	else
-	{
-		throw VersionIncomplete(QObject::tr("Can't apply incomplete/builtin Minecraft version %1").arg(m_version));
-	}
-}
-
-QString MinecraftVersion::getUrl() const
-{
-	// legacy fallback
-	if(m_versionFileURL.isEmpty())
-	{
-		return QString("http://") + URLConstants::AWS_DOWNLOAD_VERSIONS + m_version + "/" + m_version + ".json";
-	}
-	// current
-	return m_versionFileURL;
-}
-
-VersionFilePtr MinecraftVersion::getVersionFile()
-{
-	QFileInfo versionFile(QString("versions/%1/%1.dat").arg(m_version));
-	m_problems.clear();
-	if(!versionFile.exists())
-	{
-		if(m_loadedVersionFile)
-		{
-			m_loadedVersionFile.reset();
-		}
-		addProblem(PROBLEM_WARNING, QObject::tr("The patch file doesn't exist locally. It's possible it just needs to be downloaded."));
-	}
-	else
-	{
-		try
-		{
-			if(versionFile.lastModified() != m_loadedVersionFileTimestamp)
-			{
-				auto loadedVersionFile = ProfileUtils::parseBinaryJsonFile(versionFile);
-				loadedVersionFile->name = "Minecraft";
-				loadedVersionFile->setCustomizable(true);
-				m_loadedVersionFileTimestamp = versionFile.lastModified();
-				m_loadedVersionFile = loadedVersionFile;
-			}
-		}
-		catch(Exception e)
-		{
-			m_loadedVersionFile.reset();
-			addProblem(PROBLEM_ERROR, QObject::tr("The patch file couldn't be read:\n%1").arg(e.cause()));
-		}
-	}
-	return m_loadedVersionFile;
-}
-
-bool MinecraftVersion::isCustomizable()
-{
-	switch(m_versionSource)
-	{
-		case Local:
-		case Remote:
-			// locally cached file, or a remote file that we can acquire can be customized
-			return true;
-		default:
-			// Everything else is undefined and therefore not customizable.
-			return false;
-	}
-	return false;
-}
-
-const QList<PatchProblem> &MinecraftVersion::getProblems()
-{
-	if(getVersionFile())
-	{
-		return getVersionFile()->getProblems();
-	}
-	return ProfilePatch::getProblems();
-}
-
-ProblemSeverity MinecraftVersion::getProblemSeverity()
-{
-	if(getVersionFile())
-	{
-		return getVersionFile()->getProblemSeverity();
-	}
-	return ProfilePatch::getProblemSeverity();
-}
-
-void MinecraftVersion::applyTo(MinecraftProfile *profile)
-{
-	// do we have this one cached?
-	if (m_versionSource == Local)
-	{
-		applyFileTo(profile);
-		return;
-	}
-	throw VersionIncomplete(QObject::tr("Minecraft version %1 could not be applied: version files are missing.").arg(m_version));
-}
-
-int MinecraftVersion::getOrder()
-{
-	return order;
-}
-
-void MinecraftVersion::setOrder(int order)
-{
-	this->order = order;
-}
-
-QList<JarmodPtr> MinecraftVersion::getJarMods()
-{
-	return QList<JarmodPtr>();
-}
-
-QString MinecraftVersion::getName()
-{
-	return "Minecraft";
-}
-QString MinecraftVersion::getVersion()
-{
-	return m_version;
-}
-QString MinecraftVersion::getID()
-{
-	return "net.minecraft";
-}
-QString MinecraftVersion::getFilename()
-{
-	return QString();
-}
-QDateTime MinecraftVersion::getReleaseDateTime()
-{
-	return m_releaseTime;
-}
-
-
-bool MinecraftVersion::needsUpdate()
-{
-	return m_versionSource == Remote || hasUpdate();
-}
-
-bool MinecraftVersion::hasUpdate()
-{
-	return m_versionSource == Remote || (m_versionSource == Local && upstreamUpdate);
-}
-
-bool MinecraftVersion::isCustom()
-{
-	// if we add any other source types, this will evaluate to false for them.
-	return m_versionSource != Local && m_versionSource != Remote;
-}
diff --git a/libraries/logic/minecraft/MinecraftVersion.h b/libraries/logic/minecraft/MinecraftVersion.h
deleted file mode 100644
index b21427d9..00000000
--- a/libraries/logic/minecraft/MinecraftVersion.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QStringList>
-#include <QSet>
-#include <QDateTime>
-
-#include "BaseVersion.h"
-#include "ProfilePatch.h"
-#include "VersionFile.h"
-
-#include "multimc_logic_export.h"
-
-class MinecraftProfile;
-class MinecraftVersion;
-typedef std::shared_ptr<MinecraftVersion> MinecraftVersionPtr;
-
-class MULTIMC_LOGIC_EXPORT MinecraftVersion : public BaseVersion, public ProfilePatch
-{
-friend class MinecraftVersionList;
-
-public: /* methods */
-	// FIXME: nuke this.
-	bool usesLegacyLauncher();
-
-	virtual QString descriptor() override;
-	virtual QString name() override;
-	virtual QString typeString() const override;
-	virtual bool hasJarMods() override;
-	virtual bool isMinecraftVersion() override;
-	virtual void applyTo(MinecraftProfile *profile) override;
-	virtual int getOrder() override;
-	virtual void setOrder(int order) override;
-	virtual QList<JarmodPtr> getJarMods() override;
-	virtual QString getID() override;
-	virtual QString getVersion() override;
-	virtual QString getName() override;
-	virtual QString getFilename() override;
-	QDateTime getReleaseDateTime() override;
-	VersionSource getVersionSource() override;
-
-	bool needsUpdate();
-	bool hasUpdate();
-	virtual bool isCustom() override;
-	virtual bool isMoveable() override
-	{
-		return false;
-	}
-	virtual bool isCustomizable() override;
-	virtual bool isRemovable() override
-	{
-		return false;
-	}
-	virtual bool isRevertible() override
-	{
-		return false;
-	}
-	virtual bool isEditable() override
-	{
-		return false;
-	}
-	virtual bool isVersionChangeable() override
-	{
-		return true;
-	}
-
-	virtual VersionFilePtr getVersionFile() override;
-
-	// virtual QJsonDocument toJson(bool saveOrder) override;
-
-	QString getUrl() const;
-
-	virtual const QList<PatchProblem> &getProblems() override;
-	virtual ProblemSeverity getProblemSeverity() override;
-
-private: /* methods */
-	void applyFileTo(MinecraftProfile *profile);
-
-protected: /* data */
-	VersionSource m_versionSource = Remote;
-
-	/// The URL that this version will be downloaded from.
-	QString m_versionFileURL;
-
-	/// the human readable version name
-	QString m_version;
-
-	/// The type of this release
-	QString m_type;
-
-	/// the time this version was actually released by Mojang
-	QDateTime m_releaseTime;
-
-	/// the time this version was last updated by Mojang
-	QDateTime m_updateTime;
-
-	/// order of this file... default = -2
-	int order = -2;
-
-	/// an update available from Mojang
-	MinecraftVersionPtr upstreamUpdate;
-
-	QDateTime m_loadedVersionFileTimestamp;
-	mutable VersionFilePtr m_loadedVersionFile;
-};
diff --git a/libraries/logic/minecraft/MinecraftVersionList.cpp b/libraries/logic/minecraft/MinecraftVersionList.cpp
deleted file mode 100644
index a5cc3a39..00000000
--- a/libraries/logic/minecraft/MinecraftVersionList.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtXml>
-#include "Json.h"
-#include <QtAlgorithms>
-#include <QtNetwork>
-
-#include "Env.h"
-#include "Exception.h"
-
-#include "MinecraftVersionList.h"
-#include "net/URLConstants.h"
-
-#include "ParseUtils.h"
-#include "ProfileUtils.h"
-#include "VersionFilterData.h"
-#include "onesix/OneSixVersionFormat.h"
-#include "MojangVersionFormat.h"
-#include <FileSystem.h>
-
-static const char * localVersionCache = "versions/versions.dat";
-
-class MCVListLoadTask : public Task
-{
-	Q_OBJECT
-
-public:
-	explicit MCVListLoadTask(MinecraftVersionList *vlist);
-	virtual ~MCVListLoadTask() override{};
-
-	virtual void executeTask() override;
-
-protected
-slots:
-	void list_downloaded();
-
-protected:
-	QNetworkReply *vlistReply;
-	MinecraftVersionList *m_list;
-	MinecraftVersion *m_currentStable;
-};
-
-class MCVListVersionUpdateTask : public Task
-{
-	Q_OBJECT
-
-public:
-	explicit MCVListVersionUpdateTask(MinecraftVersionList *vlist, std::shared_ptr<MinecraftVersion> updatedVersion);
-	virtual ~MCVListVersionUpdateTask() override{};
-	virtual void executeTask() override;
-
-protected
-slots:
-	void json_downloaded();
-
-protected:
-	NetJobPtr specificVersionDownloadJob;
-	std::shared_ptr<MinecraftVersion> updatedVersion;
-	MinecraftVersionList *m_list;
-};
-
-class ListLoadError : public Exception
-{
-public:
-	ListLoadError(QString cause) : Exception(cause) {};
-	virtual ~ListLoadError() noexcept
-	{
-	}
-};
-
-MinecraftVersionList::MinecraftVersionList(QObject *parent) : BaseVersionList(parent)
-{
-	loadCachedList();
-}
-
-Task *MinecraftVersionList::getLoadTask()
-{
-	return new MCVListLoadTask(this);
-}
-
-bool MinecraftVersionList::isLoaded()
-{
-	return m_loaded;
-}
-
-const BaseVersionPtr MinecraftVersionList::at(int i) const
-{
-	return m_vlist.at(i);
-}
-
-int MinecraftVersionList::count() const
-{
-	return m_vlist.count();
-}
-
-static bool cmpVersions(BaseVersionPtr first, BaseVersionPtr second)
-{
-	auto left = std::dynamic_pointer_cast<MinecraftVersion>(first);
-	auto right = std::dynamic_pointer_cast<MinecraftVersion>(second);
-	return left->getReleaseDateTime() > right->getReleaseDateTime();
-}
-
-void MinecraftVersionList::sortInternal()
-{
-	qSort(m_vlist.begin(), m_vlist.end(), cmpVersions);
-}
-
-void MinecraftVersionList::loadCachedList()
-{
-	QFile localIndex(localVersionCache);
-	if (!localIndex.exists())
-	{
-		return;
-	}
-	if (!localIndex.open(QIODevice::ReadOnly))
-	{
-		// FIXME: this is actually a very bad thing! How do we deal with this?
-		qCritical() << "The minecraft version cache can't be read.";
-		return;
-	}
-	auto data = localIndex.readAll();
-	try
-	{
-		localIndex.close();
-		QJsonDocument jsonDoc = QJsonDocument::fromBinaryData(data);
-		if (jsonDoc.isNull())
-		{
-			throw ListLoadError(tr("Error reading the version list."));
-		}
-		loadList(jsonDoc, Local);
-	}
-	catch (Exception &e)
-	{
-		// the cache has gone bad for some reason... flush it.
-		qCritical() << "The minecraft version cache is corrupted. Flushing cache.";
-		localIndex.remove();
-		return;
-	}
-	m_hasLocalIndex = true;
-}
-
-void MinecraftVersionList::loadList(QJsonDocument jsonDoc, VersionSource source)
-{
-	qDebug() << "Loading" << ((source == Remote) ? "remote" : "local") << "version list.";
-
-	if (!jsonDoc.isObject())
-	{
-		throw ListLoadError(tr("Error parsing version list JSON: jsonDoc is not an object"));
-	}
-
-	QJsonObject root = jsonDoc.object();
-
-	try
-	{
-		QJsonObject latest = Json::requireObject(root.value("latest"));
-		m_latestReleaseID = Json::requireString(latest.value("release"));
-		m_latestSnapshotID = Json::requireString(latest.value("snapshot"));
-	}
-	catch (Exception &err)
-	{
-		qCritical()
-			<< tr("Error parsing version list JSON: couldn't determine latest versions");
-	}
-
-	// Now, get the array of versions.
-	if (!root.value("versions").isArray())
-	{
-		throw ListLoadError(tr("Error parsing version list JSON: version list object is "
-							   "missing 'versions' array"));
-	}
-	QJsonArray versions = root.value("versions").toArray();
-
-	QList<BaseVersionPtr> tempList;
-	for (auto version : versions)
-	{
-		// Load the version info.
-		if (!version.isObject())
-		{
-			qCritical() << "Error while parsing version list : invalid JSON structure";
-			continue;
-		}
-
-		QJsonObject versionObj = version.toObject();
-		QString versionID = versionObj.value("id").toString("");
-		if (versionID.isEmpty())
-		{
-			qCritical() << "Error while parsing version : version ID is missing";
-			continue;
-		}
-
-		if (g_VersionFilterData.legacyBlacklist.contains(versionID))
-		{
-			qWarning() << "Blacklisted legacy version ignored: " << versionID;
-			continue;
-		}
-
-		// Now, we construct the version object and add it to the list.
-		std::shared_ptr<MinecraftVersion> mcVersion(new MinecraftVersion());
-		mcVersion->m_version = versionID;
-
-		mcVersion->m_releaseTime = timeFromS3Time(versionObj.value("releaseTime").toString(""));
-		mcVersion->m_updateTime = timeFromS3Time(versionObj.value("time").toString(""));
-
-		// depends on where we load the version from -- network request or local file?
-		mcVersion->m_versionSource = source;
-		mcVersion->m_versionFileURL = versionObj.value("url").toString("");
-		QString versionTypeStr = versionObj.value("type").toString("");
-		if (versionTypeStr.isEmpty())
-		{
-			qCritical() << "Ignoring" << versionID
-						 << "because it doesn't have the version type set.";
-			continue;
-		}
-		// OneSix or Legacy. use filter to determine type
-		if (versionTypeStr == "release")
-		{
-		}
-		else if (versionTypeStr == "snapshot") // It's a snapshot... yay
-		{
-		}
-		else if (versionTypeStr == "old_alpha")
-		{
-		}
-		else if (versionTypeStr == "old_beta")
-		{
-		}
-		else
-		{
-			qCritical() << "Ignoring" << versionID
-						 << "because it has an invalid version type.";
-			continue;
-		}
-		mcVersion->m_type = versionTypeStr;
-		qDebug() << "Loaded version" << versionID << "from"
-					<< ((source == Remote) ? "remote" : "local") << "version list.";
-		tempList.append(mcVersion);
-	}
-	updateListData(tempList);
-	if(source == Remote)
-	{
-		m_loaded = true;
-	}
-}
-
-void MinecraftVersionList::sortVersions()
-{
-	beginResetModel();
-	sortInternal();
-	endResetModel();
-}
-
-QVariant MinecraftVersionList::data(const QModelIndex& index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	auto version = std::dynamic_pointer_cast<MinecraftVersion>(m_vlist[index.row()]);
-	switch (role)
-	{
-	case VersionPointerRole:
-		return qVariantFromValue(m_vlist[index.row()]);
-
-	case VersionRole:
-		return version->name();
-
-	case VersionIdRole:
-		return version->descriptor();
-
-	case RecommendedRole:
-		return version->descriptor() == m_latestReleaseID;
-
-	case LatestRole:
-	{
-		if(version->descriptor() != m_latestSnapshotID)
-			return false;
-		MinecraftVersionPtr latestRelease = std::dynamic_pointer_cast<MinecraftVersion>(getLatestStable());
-		/*
-		if(latestRelease && latestRelease->m_releaseTime > version->m_releaseTime)
-		{
-			return false;
-		}
-		*/
-		return true;
-	}
-
-	case TypeRole:
-		return version->typeString();
-
-	default:
-		return QVariant();
-	}
-}
-
-BaseVersionList::RoleList MinecraftVersionList::providesRoles() const
-{
-	return {VersionPointerRole, VersionRole, VersionIdRole, RecommendedRole, LatestRole, TypeRole};
-}
-
-BaseVersionPtr MinecraftVersionList::getLatestStable() const
-{
-	if(m_lookup.contains(m_latestReleaseID))
-		return m_lookup[m_latestReleaseID];
-	return BaseVersionPtr();
-}
-
-BaseVersionPtr MinecraftVersionList::getRecommended() const
-{
-	return getLatestStable();
-}
-
-void MinecraftVersionList::updateListData(QList<BaseVersionPtr> versions)
-{
-	beginResetModel();
-	for (auto version : versions)
-	{
-		auto descr = version->descriptor();
-
-		if (!m_lookup.contains(descr))
-		{
-			m_lookup[version->descriptor()] = version;
-			m_vlist.append(version);
-			continue;
-		}
-		auto orig = std::dynamic_pointer_cast<MinecraftVersion>(m_lookup[descr]);
-		auto added = std::dynamic_pointer_cast<MinecraftVersion>(version);
-		// updateListData is called after Mojang list loads. those can be local or remote
-		// remote comes always after local
-		// any other options are ignored
-		if (orig->m_versionSource != Local || added->m_versionSource != Remote)
-		{
-			continue;
-		}
-		// alright, it's an update. put it inside the original, for further processing.
-		orig->upstreamUpdate = added;
-	}
-	sortInternal();
-	endResetModel();
-}
-
-MCVListLoadTask::MCVListLoadTask(MinecraftVersionList *vlist)
-{
-	m_list = vlist;
-	m_currentStable = NULL;
-	vlistReply = nullptr;
-}
-
-void MCVListLoadTask::executeTask()
-{
-	setStatus(tr("Loading instance version list..."));
-	auto worker = ENV.qnam();
-	vlistReply = worker->get(QNetworkRequest(QUrl("https://launchermeta.mojang.com/mc/game/version_manifest.json")));
-	connect(vlistReply, SIGNAL(finished()), this, SLOT(list_downloaded()));
-}
-
-void MCVListLoadTask::list_downloaded()
-{
-	if (vlistReply->error() != QNetworkReply::NoError)
-	{
-		vlistReply->deleteLater();
-		emitFailed("Failed to load Minecraft main version list" + vlistReply->errorString());
-		return;
-	}
-
-	auto data = vlistReply->readAll();
-	vlistReply->deleteLater();
-	try
-	{
-		QJsonParseError jsonError;
-		QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-		if (jsonError.error != QJsonParseError::NoError)
-		{
-			throw ListLoadError(
-				tr("Error parsing version list JSON: %1").arg(jsonError.errorString()));
-		}
-		m_list->loadList(jsonDoc, Remote);
-	}
-	catch (Exception &e)
-	{
-		emitFailed(e.cause());
-		return;
-	}
-
-	emitSucceeded();
-	return;
-}
-
-MCVListVersionUpdateTask::MCVListVersionUpdateTask(MinecraftVersionList *vlist, std::shared_ptr<MinecraftVersion> updatedVersion)
-	: Task()
-{
-	m_list = vlist;
-	this->updatedVersion = updatedVersion;
-}
-
-void MCVListVersionUpdateTask::executeTask()
-{
-	auto job = new NetJob("Version index");
-	job->addNetAction(ByteArrayDownload::make(QUrl(updatedVersion->getUrl())));
-	specificVersionDownloadJob.reset(job);
-	connect(specificVersionDownloadJob.get(), SIGNAL(succeeded()), SLOT(json_downloaded()));
-	connect(specificVersionDownloadJob.get(), SIGNAL(failed(QString)), SIGNAL(failed(QString)));
-	connect(specificVersionDownloadJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	specificVersionDownloadJob->start();
-}
-
-void MCVListVersionUpdateTask::json_downloaded()
-{
-	NetActionPtr DlJob = specificVersionDownloadJob->first();
-	auto data = std::dynamic_pointer_cast<ByteArrayDownload>(DlJob)->m_data;
-	specificVersionDownloadJob.reset();
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		emitFailed(tr("The download version file is not valid."));
-		return;
-	}
-	VersionFilePtr file;
-	try
-	{
-		file = MojangVersionFormat::versionFileFromJson(jsonDoc, "net.minecraft.json");
-	}
-	catch (Exception &e)
-	{
-		emitFailed(tr("Couldn't process version file: %1").arg(e.cause()));
-		return;
-	}
-
-	// Strip LWJGL from the version file. We use our own.
-	ProfileUtils::removeLwjglFromPatch(file);
-
-	file->fileId = "net.minecraft";
-
-	// now dump the file to disk
-	auto doc = OneSixVersionFormat::versionFileToJson(file, false);
-	auto newdata = doc.toBinaryData();
-	auto id = updatedVersion->descriptor();
-	QString targetPath = "versions/" + id + "/" + id + ".dat";
-	FS::ensureFilePathExists(targetPath);
-	QSaveFile vfile1(targetPath);
-	if (!vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly))
-	{
-		emitFailed(tr("Can't open %1 for writing.").arg(targetPath));
-		return;
-	}
-	qint64 actual = 0;
-	if ((actual = vfile1.write(newdata)) != newdata.size())
-	{
-		emitFailed(tr("Failed to write into %1. Written %2 out of %3.")
-					   .arg(targetPath)
-					   .arg(actual)
-					   .arg(newdata.size()));
-		return;
-	}
-	if (!vfile1.commit())
-	{
-		emitFailed(tr("Can't commit changes to %1").arg(targetPath));
-		return;
-	}
-
-	m_list->finalizeUpdate(id);
-	emitSucceeded();
-}
-
-std::shared_ptr<Task> MinecraftVersionList::createUpdateTask(QString version)
-{
-	auto iter = m_lookup.find(version);
-	if(iter == m_lookup.end())
-		return nullptr;
-
-	auto mcversion = std::dynamic_pointer_cast<MinecraftVersion>(*iter);
-	if(!mcversion)
-	{
-		return nullptr;
-	}
-
-	return std::shared_ptr<Task>(new MCVListVersionUpdateTask(this, mcversion));
-}
-
-void MinecraftVersionList::saveCachedList()
-{
-	// FIXME: throw.
-	if (!FS::ensureFilePathExists(localVersionCache))
-		return;
-	QSaveFile tfile(localVersionCache);
-	if (!tfile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-		return;
-	QJsonObject toplevel;
-	QJsonArray entriesArr;
-	for (auto version : m_vlist)
-	{
-		auto mcversion = std::dynamic_pointer_cast<MinecraftVersion>(version);
-		// do not save the remote versions.
-		if (mcversion->m_versionSource != Local)
-			continue;
-		QJsonObject entryObj;
-
-		entryObj.insert("id", mcversion->descriptor());
-		entryObj.insert("version", mcversion->descriptor());
-		entryObj.insert("time", timeToS3Time(mcversion->m_updateTime));
-		entryObj.insert("releaseTime", timeToS3Time(mcversion->m_releaseTime));
-		entryObj.insert("url", mcversion->m_versionFileURL);
-		entryObj.insert("type", mcversion->m_type);
-		entriesArr.append(entryObj);
-	}
-	toplevel.insert("versions", entriesArr);
-
-	{
-		bool someLatest = false;
-		QJsonObject latestObj;
-		if(!m_latestReleaseID.isNull())
-		{
-			latestObj.insert("release", m_latestReleaseID);
-			someLatest = true;
-		}
-		if(!m_latestSnapshotID.isNull())
-		{
-			latestObj.insert("snapshot", m_latestSnapshotID);
-			someLatest = true;
-		}
-		if(someLatest)
-		{
-			toplevel.insert("latest", latestObj);
-		}
-	}
-
-	QJsonDocument doc(toplevel);
-	QByteArray jsonData = doc.toBinaryData();
-	qint64 result = tfile.write(jsonData);
-	if (result == -1)
-		return;
-	if (result != jsonData.size())
-		return;
-	tfile.commit();
-}
-
-void MinecraftVersionList::finalizeUpdate(QString version)
-{
-	int idx = -1;
-	for (int i = 0; i < m_vlist.size(); i++)
-	{
-		if (version == m_vlist[i]->descriptor())
-		{
-			idx = i;
-			break;
-		}
-	}
-	if (idx == -1)
-	{
-		return;
-	}
-
-	auto updatedVersion = std::dynamic_pointer_cast<MinecraftVersion>(m_vlist[idx]);
-
-	// if we have an update for the version, replace it, make the update local
-	if (updatedVersion->upstreamUpdate)
-	{
-		auto updatedWith = updatedVersion->upstreamUpdate;
-		updatedWith->m_versionSource = Local;
-		m_vlist[idx] = updatedWith;
-		m_lookup[version] = updatedWith;
-	}
-	else
-	{
-		// otherwise, just set the version as local;
-		updatedVersion->m_versionSource = Local;
-	}
-
-	dataChanged(index(idx), index(idx));
-
-	saveCachedList();
-}
-
-#include "MinecraftVersionList.moc"
diff --git a/libraries/logic/minecraft/MinecraftVersionList.h b/libraries/logic/minecraft/MinecraftVersionList.h
deleted file mode 100644
index 0fca02a7..00000000
--- a/libraries/logic/minecraft/MinecraftVersionList.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QList>
-#include <QSet>
-
-#include "BaseVersionList.h"
-#include "tasks/Task.h"
-#include "minecraft/MinecraftVersion.h"
-#include <net/NetJob.h>
-
-#include "multimc_logic_export.h"
-
-class MCVListLoadTask;
-class MCVListVersionUpdateTask;
-
-class MULTIMC_LOGIC_EXPORT MinecraftVersionList : public BaseVersionList
-{
-	Q_OBJECT
-private:
-	void sortInternal();
-	void loadList(QJsonDocument jsonDoc, VersionSource source);
-	void loadCachedList();
-	void saveCachedList();
-	void finalizeUpdate(QString version);
-public:
-	friend class MCVListLoadTask;
-	friend class MCVListVersionUpdateTask;
-
-	explicit MinecraftVersionList(QObject *parent = 0);
-
-	std::shared_ptr<Task> createUpdateTask(QString version);
-
-	virtual Task *getLoadTask() override;
-	virtual bool isLoaded() override;
-	virtual const BaseVersionPtr at(int i) const override;
-	virtual int count() const override;
-	virtual void sortVersions() override;
-	virtual QVariant data(const QModelIndex & index, int role) const override;
-	virtual RoleList providesRoles() const override;
-
-	virtual BaseVersionPtr getLatestStable() const override;
-	virtual BaseVersionPtr getRecommended() const override;
-
-protected:
-	QList<BaseVersionPtr> m_vlist;
-	QMap<QString, BaseVersionPtr> m_lookup;
-
-	bool m_loaded = false;
-	bool m_hasLocalIndex = false;
-	QString m_latestReleaseID = "INVALID";
-	QString m_latestSnapshotID = "INVALID";
-
-protected
-slots:
-	virtual void updateListData(QList<BaseVersionPtr> versions) override;
-};
diff --git a/libraries/logic/minecraft/Mod.cpp b/libraries/logic/minecraft/Mod.cpp
deleted file mode 100644
index 9b9f76f9..00000000
--- a/libraries/logic/minecraft/Mod.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QDir>
-#include <QString>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <quazip.h>
-#include <quazipfile.h>
-
-#include "Mod.h"
-#include "settings/INIFile.h"
-#include <FileSystem.h>
-#include <QDebug>
-
-Mod::Mod(const QFileInfo &file)
-{
-	repath(file);
-}
-
-void Mod::repath(const QFileInfo &file)
-{
-	m_file = file;
-	QString name_base = file.fileName();
-
-	m_type = Mod::MOD_UNKNOWN;
-
-	if (m_file.isDir())
-	{
-		m_type = MOD_FOLDER;
-		m_name = name_base;
-		m_mmc_id = name_base;
-	}
-	else if (m_file.isFile())
-	{
-		if (name_base.endsWith(".disabled"))
-		{
-			m_enabled = false;
-			name_base.chop(9);
-		}
-		else
-		{
-			m_enabled = true;
-		}
-		m_mmc_id = name_base;
-		if (name_base.endsWith(".zip") || name_base.endsWith(".jar"))
-		{
-			m_type = MOD_ZIPFILE;
-			name_base.chop(4);
-		}
-		else if (name_base.endsWith(".litemod"))
-		{
-			m_type = MOD_LITEMOD;
-			name_base.chop(8);
-		}
-		else
-		{
-			m_type = MOD_SINGLEFILE;
-		}
-		m_name = name_base;
-	}
-
-	if (m_type == MOD_ZIPFILE)
-	{
-		QuaZip zip(m_file.filePath());
-		if (!zip.open(QuaZip::mdUnzip))
-			return;
-
-		QuaZipFile file(&zip);
-
-		if (zip.setCurrentFile("mcmod.info"))
-		{
-			if (!file.open(QIODevice::ReadOnly))
-			{
-				zip.close();
-				return;
-			}
-
-			ReadMCModInfo(file.readAll());
-			file.close();
-			zip.close();
-			return;
-		}
-		else if (zip.setCurrentFile("forgeversion.properties"))
-		{
-			if (!file.open(QIODevice::ReadOnly))
-			{
-				zip.close();
-				return;
-			}
-
-			ReadForgeInfo(file.readAll());
-			file.close();
-			zip.close();
-			return;
-		}
-
-		zip.close();
-	}
-	else if (m_type == MOD_FOLDER)
-	{
-		QFileInfo mcmod_info(FS::PathCombine(m_file.filePath(), "mcmod.info"));
-		if (mcmod_info.isFile())
-		{
-			QFile mcmod(mcmod_info.filePath());
-			if (!mcmod.open(QIODevice::ReadOnly))
-				return;
-			auto data = mcmod.readAll();
-			if (data.isEmpty() || data.isNull())
-				return;
-			ReadMCModInfo(data);
-		}
-	}
-	else if (m_type == MOD_LITEMOD)
-	{
-		QuaZip zip(m_file.filePath());
-		if (!zip.open(QuaZip::mdUnzip))
-			return;
-
-		QuaZipFile file(&zip);
-
-		if (zip.setCurrentFile("litemod.json"))
-		{
-			if (!file.open(QIODevice::ReadOnly))
-			{
-				zip.close();
-				return;
-			}
-
-			ReadLiteModInfo(file.readAll());
-			file.close();
-		}
-		zip.close();
-	}
-}
-
-// NEW format
-// https://github.com/MinecraftForge/FML/wiki/FML-mod-information-file/6f62b37cea040daf350dc253eae6326dd9c822c3
-
-// OLD format:
-// https://github.com/MinecraftForge/FML/wiki/FML-mod-information-file/5bf6a2d05145ec79387acc0d45c958642fb049fc
-void Mod::ReadMCModInfo(QByteArray contents)
-{
-	auto getInfoFromArray = [&](QJsonArray arr)->void
-	{
-		if (!arr.at(0).isObject())
-			return;
-		auto firstObj = arr.at(0).toObject();
-		m_mod_id = firstObj.value("modid").toString();
-		m_name = firstObj.value("name").toString();
-		m_version = firstObj.value("version").toString();
-		m_homeurl = firstObj.value("url").toString();
-		m_updateurl = firstObj.value("updateUrl").toString();
-		m_homeurl = m_homeurl.trimmed();
-		if(!m_homeurl.isEmpty())
-		{
-			// fix up url.
-			if (!m_homeurl.startsWith("http://") && !m_homeurl.startsWith("https://") &&
-				!m_homeurl.startsWith("ftp://"))
-			{
-				m_homeurl.prepend("http://");
-			}
-		}
-		m_description = firstObj.value("description").toString();
-		QJsonArray authors = firstObj.value("authorList").toArray();
-		if (authors.size() == 0)
-			authors = firstObj.value("authors").toArray();
-
-		if (authors.size() == 0)
-			m_authors = "";
-		else if (authors.size() >= 1)
-		{
-			m_authors = authors.at(0).toString();
-			for (int i = 1; i < authors.size(); i++)
-			{
-				m_authors += ", " + authors.at(i).toString();
-			}
-		}
-		m_credits = firstObj.value("credits").toString();
-		return;
-	}
-	;
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError);
-	// this is the very old format that had just the array
-	if (jsonDoc.isArray())
-	{
-		getInfoFromArray(jsonDoc.array());
-	}
-	else if (jsonDoc.isObject())
-	{
-		auto val = jsonDoc.object().value("modinfoversion");
-		if(val.isUndefined())
-			val = jsonDoc.object().value("modListVersion");
-		int version = val.toDouble();
-		if (version != 2)
-		{
-			qCritical() << "BAD stuff happened to mod json:";
-			qCritical() << contents;
-			return;
-		}
-		auto arrVal = jsonDoc.object().value("modlist");
-		if(arrVal.isUndefined())
-			arrVal = jsonDoc.object().value("modList");
-		if (arrVal.isArray())
-		{
-			getInfoFromArray(arrVal.toArray());
-		}
-	}
-}
-
-void Mod::ReadForgeInfo(QByteArray contents)
-{
-	// Read the data
-	m_name = "Minecraft Forge";
-	m_mod_id = "Forge";
-	m_homeurl = "http://www.minecraftforge.net/forum/";
-	INIFile ini;
-	if (!ini.loadFile(contents))
-		return;
-
-	QString major = ini.get("forge.major.number", "0").toString();
-	QString minor = ini.get("forge.minor.number", "0").toString();
-	QString revision = ini.get("forge.revision.number", "0").toString();
-	QString build = ini.get("forge.build.number", "0").toString();
-
-	m_version = major + "." + minor + "." + revision + "." + build;
-}
-
-void Mod::ReadLiteModInfo(QByteArray contents)
-{
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError);
-	auto object = jsonDoc.object();
-	if (object.contains("name"))
-	{
-		m_mod_id = m_name = object.value("name").toString();
-	}
-	if (object.contains("version"))
-	{
-		m_version = object.value("version").toString("");
-	}
-	else
-	{
-		m_version = object.value("revision").toString("");
-	}
-	m_mcversion = object.value("mcversion").toString();
-	m_authors = object.value("author").toString();
-	m_description = object.value("description").toString();
-	m_homeurl = object.value("url").toString();
-}
-
-bool Mod::replace(Mod &with)
-{
-	if (!destroy())
-		return false;
-	bool success = false;
-	auto t = with.type();
-
-	if (t == MOD_ZIPFILE || t == MOD_SINGLEFILE || t == MOD_LITEMOD)
-	{
-		qDebug() << "Copy: " << with.m_file.filePath() << " to " << m_file.filePath();
-		success = QFile::copy(with.m_file.filePath(), m_file.filePath());
-	}
-	if (t == MOD_FOLDER)
-	{
-		success = FS::copy(with.m_file.filePath(), m_file.path())();
-	}
-	if (success)
-	{
-		m_name = with.m_name;
-		m_mmc_id = with.m_mmc_id;
-		m_mod_id = with.m_mod_id;
-		m_version = with.m_version;
-		m_mcversion = with.m_mcversion;
-		m_description = with.m_description;
-		m_authors = with.m_authors;
-		m_credits = with.m_credits;
-		m_homeurl = with.m_homeurl;
-		m_type = with.m_type;
-		m_file.refresh();
-	}
-	return success;
-}
-
-bool Mod::destroy()
-{
-	if (m_type == MOD_FOLDER)
-	{
-		QDir d(m_file.filePath());
-		if (d.removeRecursively())
-		{
-			m_type = MOD_UNKNOWN;
-			return true;
-		}
-		return false;
-	}
-	else if (m_type == MOD_SINGLEFILE || m_type == MOD_ZIPFILE || m_type == MOD_LITEMOD)
-	{
-		QFile f(m_file.filePath());
-		if (f.remove())
-		{
-			m_type = MOD_UNKNOWN;
-			return true;
-		}
-		return false;
-	}
-	return true;
-}
-
-QString Mod::version() const
-{
-	switch (type())
-	{
-	case MOD_ZIPFILE:
-	case MOD_LITEMOD:
-		return m_version;
-	case MOD_FOLDER:
-		return "Folder";
-	case MOD_SINGLEFILE:
-		return "File";
-	default:
-		return "VOID";
-	}
-}
-
-bool Mod::enable(bool value)
-{
-	if (m_type == Mod::MOD_UNKNOWN || m_type == Mod::MOD_FOLDER)
-		return false;
-
-	if (m_enabled == value)
-		return false;
-
-	QString path = m_file.absoluteFilePath();
-	if (value)
-	{
-		QFile foo(path);
-		if (!path.endsWith(".disabled"))
-			return false;
-		path.chop(9);
-		if (!foo.rename(path))
-			return false;
-	}
-	else
-	{
-		QFile foo(path);
-		path += ".disabled";
-		if (!foo.rename(path))
-			return false;
-	}
-	m_file = QFileInfo(path);
-	m_enabled = value;
-	return true;
-}
-bool Mod::operator==(const Mod &other) const
-{
-	return mmc_id() == other.mmc_id();
-}
-bool Mod::strongCompare(const Mod &other) const
-{
-	return mmc_id() == other.mmc_id() && version() == other.version() && type() == other.type();
-}
diff --git a/libraries/logic/minecraft/Mod.h b/libraries/logic/minecraft/Mod.h
deleted file mode 100644
index 19f4c740..00000000
--- a/libraries/logic/minecraft/Mod.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QFileInfo>
-
-class Mod
-{
-public:
-	enum ModType
-	{
-		MOD_UNKNOWN,	//!< Indicates an unspecified mod type.
-		MOD_ZIPFILE,	//!< The mod is a zip file containing the mod's class files.
-		MOD_SINGLEFILE, //!< The mod is a single file (not a zip file).
-		MOD_FOLDER,	 //!< The mod is in a folder on the filesystem.
-		MOD_LITEMOD, //!< The mod is a litemod
-	};
-
-	Mod(const QFileInfo &file);
-
-	QFileInfo filename() const
-	{
-		return m_file;
-	}
-	QString mmc_id() const
-	{
-		return m_mmc_id;
-	}
-	QString mod_id() const
-	{
-		return m_mod_id;
-	}
-	ModType type() const
-	{
-		return m_type;
-	}
-	QString mcversion() const
-	{
-		return m_mcversion;
-	}
-	;
-	bool valid()
-	{
-		return m_type != MOD_UNKNOWN;
-	}
-	QString name() const
-	{
-		if(m_name.trimmed().isEmpty())
-		{
-			return m_mmc_id;
-		}
-		return m_name;
-	}
-
-	QString version() const;
-
-	QString homeurl() const
-	{
-		return m_homeurl;
-	}
-
-	QString description() const
-	{
-		return m_description;
-	}
-
-	QString authors() const
-	{
-		return m_authors;
-	}
-
-	QString credits() const
-	{
-		return m_credits;
-	}
-
-	bool enabled() const
-	{
-		return m_enabled;
-	}
-
-	bool enable(bool value);
-
-	// delete all the files of this mod
-	bool destroy();
-	// replace this mod with a copy of the other
-	bool replace(Mod &with);
-	// change the mod's filesystem path (used by mod lists for *MAGIC* purposes)
-	void repath(const QFileInfo &file);
-
-	// WEAK compare operator - used for replacing mods
-	bool operator==(const Mod &other) const;
-	bool strongCompare(const Mod &other) const;
-
-private:
-	void ReadMCModInfo(QByteArray contents);
-	void ReadForgeInfo(QByteArray contents);
-	void ReadLiteModInfo(QByteArray contents);
-
-protected:
-
-	// FIXME: what do do with those? HMM...
-	/*
-	void ReadModInfoData(QString info);
-	void ReadForgeInfoData(QString infoFileData);
-	*/
-
-	QFileInfo m_file;
-	QString m_mmc_id;
-	QString m_mod_id;
-	bool m_enabled = true;
-	QString m_name;
-	QString m_version;
-	QString m_mcversion;
-	QString m_homeurl;
-	QString m_updateurl;
-	QString m_description;
-	QString m_authors;
-	QString m_credits;
-
-	ModType m_type;
-};
diff --git a/libraries/logic/minecraft/ModList.cpp b/libraries/logic/minecraft/ModList.cpp
deleted file mode 100644
index d9ed4886..00000000
--- a/libraries/logic/minecraft/ModList.cpp
+++ /dev/null
@@ -1,616 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ModList.h"
-#include <FileSystem.h>
-#include <QMimeData>
-#include <QUrl>
-#include <QUuid>
-#include <QString>
-#include <QFileSystemWatcher>
-#include <QDebug>
-
-ModList::ModList(const QString &dir, const QString &list_file)
-	: QAbstractListModel(), m_dir(dir), m_list_file(list_file)
-{
-	FS::ensureFolderPathExists(m_dir.absolutePath());
-	m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs |
-					QDir::NoSymLinks);
-	m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
-	m_list_id = QUuid::createUuid().toString();
-	m_watcher = new QFileSystemWatcher(this);
-	is_watching = false;
-	connect(m_watcher, SIGNAL(directoryChanged(QString)), this,
-			SLOT(directoryChanged(QString)));
-}
-
-void ModList::startWatching()
-{
-	update();
-	is_watching = m_watcher->addPath(m_dir.absolutePath());
-	if (is_watching)
-	{
-		qDebug() << "Started watching " << m_dir.absolutePath();
-	}
-	else
-	{
-		qDebug() << "Failed to start watching " << m_dir.absolutePath();
-	}
-}
-
-void ModList::stopWatching()
-{
-	is_watching = !m_watcher->removePath(m_dir.absolutePath());
-	if (!is_watching)
-	{
-		qDebug() << "Stopped watching " << m_dir.absolutePath();
-	}
-	else
-	{
-		qDebug() << "Failed to stop watching " << m_dir.absolutePath();
-	}
-}
-
-void ModList::internalSort(QList<Mod> &what)
-{
-	auto predicate = [](const Mod &left, const Mod &right)
-	{
-		if (left.name() == right.name())
-		{
-			return left.mmc_id().localeAwareCompare(right.mmc_id()) < 0;
-		}
-		return left.name().localeAwareCompare(right.name()) < 0;
-	};
-	std::sort(what.begin(), what.end(), predicate);
-}
-
-bool ModList::update()
-{
-	if (!isValid())
-		return false;
-
-	QList<Mod> orderedMods;
-	QList<Mod> newMods;
-	m_dir.refresh();
-	auto folderContents = m_dir.entryInfoList();
-	bool orderOrStateChanged = false;
-
-	// first, process the ordered items (if any)
-	OrderList listOrder = readListFile();
-	for (auto item : listOrder)
-	{
-		QFileInfo infoEnabled(m_dir.filePath(item.id));
-		QFileInfo infoDisabled(m_dir.filePath(item.id + ".disabled"));
-		int idxEnabled = folderContents.indexOf(infoEnabled);
-		int idxDisabled = folderContents.indexOf(infoDisabled);
-		bool isEnabled;
-		// if both enabled and disabled versions are present, it's a special case...
-		if (idxEnabled >= 0 && idxDisabled >= 0)
-		{
-			// we only process the one we actually have in the order file.
-			// and exactly as we have it.
-			// THIS IS A CORNER CASE
-			isEnabled = item.enabled;
-		}
-		else
-		{
-			// only one is present.
-			// we pick the one that we found.
-			// we assume the mod was enabled/disabled by external means
-			isEnabled = idxEnabled >= 0;
-		}
-		int idx = isEnabled ? idxEnabled : idxDisabled;
-		QFileInfo &info = isEnabled ? infoEnabled : infoDisabled;
-		// if the file from the index file exists
-		if (idx != -1)
-		{
-			// remove from the actual folder contents list
-			folderContents.takeAt(idx);
-			// append the new mod
-			orderedMods.append(Mod(info));
-			if (isEnabled != item.enabled)
-				orderOrStateChanged = true;
-		}
-		else
-		{
-			orderOrStateChanged = true;
-		}
-	}
-	// if there are any untracked files...
-	if (folderContents.size())
-	{
-		// the order surely changed!
-		for (auto entry : folderContents)
-		{
-			newMods.append(Mod(entry));
-		}
-		internalSort(newMods);
-		orderedMods.append(newMods);
-		orderOrStateChanged = true;
-	}
-	// otherwise, if we were already tracking some mods
-	else if (mods.size())
-	{
-		// if the number doesn't match, order changed.
-		if (mods.size() != orderedMods.size())
-			orderOrStateChanged = true;
-		// if it does match, compare the mods themselves
-		else
-			for (int i = 0; i < mods.size(); i++)
-			{
-				if (!mods[i].strongCompare(orderedMods[i]))
-				{
-					orderOrStateChanged = true;
-					break;
-				}
-			}
-	}
-	beginResetModel();
-	mods.swap(orderedMods);
-	endResetModel();
-	if (orderOrStateChanged && !m_list_file.isEmpty())
-	{
-		qDebug() << "Mod list " << m_list_file << " changed!";
-		saveListFile();
-		emit changed();
-	}
-	return true;
-}
-
-void ModList::directoryChanged(QString path)
-{
-	update();
-}
-
-ModList::OrderList ModList::readListFile()
-{
-	OrderList itemList;
-	if (m_list_file.isNull() || m_list_file.isEmpty())
-		return itemList;
-
-	QFile textFile(m_list_file);
-	if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text))
-		return OrderList();
-
-	QTextStream textStream;
-	textStream.setAutoDetectUnicode(true);
-	textStream.setDevice(&textFile);
-	while (true)
-	{
-		QString line = textStream.readLine();
-		if (line.isNull() || line.isEmpty())
-			break;
-		else
-		{
-			OrderItem it;
-			it.enabled = !line.endsWith(".disabled");
-			if (!it.enabled)
-			{
-				line.chop(9);
-			}
-			it.id = line;
-			itemList.append(it);
-		}
-	}
-	textFile.close();
-	return itemList;
-}
-
-bool ModList::saveListFile()
-{
-	if (m_list_file.isNull() || m_list_file.isEmpty())
-		return false;
-	QFile textFile(m_list_file);
-	if (!textFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
-		return false;
-	QTextStream textStream;
-	textStream.setGenerateByteOrderMark(true);
-	textStream.setCodec("UTF-8");
-	textStream.setDevice(&textFile);
-	for (auto mod : mods)
-	{
-		textStream << mod.mmc_id();
-		if (!mod.enabled())
-			textStream << ".disabled";
-		textStream << endl;
-	}
-	textFile.close();
-	return false;
-}
-
-bool ModList::isValid()
-{
-	return m_dir.exists() && m_dir.isReadable();
-}
-
-bool ModList::installMod(const QString &filename, int index)
-{
-	// NOTE: fix for GH-1178: remove trailing slash to avoid issues with using the empty result of QFileInfo::fileName
-	QFileInfo fileinfo(FS::NormalizePath(filename));
-
-	qDebug() << "installing: " << fileinfo.absoluteFilePath();
-
-	if (!fileinfo.exists() || !fileinfo.isReadable() || index < 0)
-	{
-		return false;
-	}
-	Mod m(fileinfo);
-	if (!m.valid())
-		return false;
-
-	// if it's already there, replace the original mod (in place)
-	int idx = mods.indexOf(m);
-	if (idx != -1)
-	{
-		int idx2 = mods.indexOf(m, idx + 1);
-		if (idx2 != -1)
-			return false;
-		if (mods[idx].replace(m))
-		{
-
-			auto left = this->index(index);
-			auto right = this->index(index, columnCount(QModelIndex()) - 1);
-			emit dataChanged(left, right);
-			saveListFile();
-			update();
-			return true;
-		}
-		return false;
-	}
-
-	auto type = m.type();
-	if (type == Mod::MOD_UNKNOWN)
-		return false;
-	if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE || type == Mod::MOD_LITEMOD)
-	{
-		QString newpath = FS::PathCombine(m_dir.path(), fileinfo.fileName());
-		if (!QFile::copy(fileinfo.filePath(), newpath))
-			return false;
-		m.repath(newpath);
-		beginInsertRows(QModelIndex(), index, index);
-		mods.insert(index, m);
-		endInsertRows();
-		saveListFile();
-		update();
-		return true;
-	}
-	else if (type == Mod::MOD_FOLDER)
-	{
-
-		QString from = fileinfo.filePath();
-		QString to = FS::PathCombine(m_dir.path(), fileinfo.fileName());
-		if (!FS::copy(from, to)())
-			return false;
-		m.repath(to);
-		beginInsertRows(QModelIndex(), index, index);
-		mods.insert(index, m);
-		endInsertRows();
-		saveListFile();
-		update();
-		return true;
-	}
-	return false;
-}
-
-bool ModList::deleteMod(int index)
-{
-	if (index >= mods.size() || index < 0)
-		return false;
-	Mod &m = mods[index];
-	if (m.destroy())
-	{
-		beginRemoveRows(QModelIndex(), index, index);
-		mods.removeAt(index);
-		endRemoveRows();
-		saveListFile();
-		emit changed();
-		return true;
-	}
-	return false;
-}
-
-bool ModList::deleteMods(int first, int last)
-{
-	for (int i = first; i <= last; i++)
-	{
-		Mod &m = mods[i];
-		m.destroy();
-	}
-	beginRemoveRows(QModelIndex(), first, last);
-	mods.erase(mods.begin() + first, mods.begin() + last + 1);
-	endRemoveRows();
-	saveListFile();
-	emit changed();
-	return true;
-}
-
-bool ModList::moveModTo(int from, int to)
-{
-	if (from < 0 || from >= mods.size())
-		return false;
-	if (to >= rowCount())
-		to = rowCount() - 1;
-	if (to == -1)
-		to = rowCount() - 1;
-	if (from == to)
-		return false;
-	int togap = to > from ? to + 1 : to;
-	beginMoveRows(QModelIndex(), from, from, QModelIndex(), togap);
-	mods.move(from, to);
-	endMoveRows();
-	saveListFile();
-	emit changed();
-	return true;
-}
-
-bool ModList::moveModUp(int from)
-{
-	if (from > 0)
-		return moveModTo(from, from - 1);
-	return false;
-}
-
-bool ModList::moveModsUp(int first, int last)
-{
-	if (first == 0)
-		return false;
-
-	beginMoveRows(QModelIndex(), first, last, QModelIndex(), first - 1);
-	mods.move(first - 1, last);
-	endMoveRows();
-	saveListFile();
-	emit changed();
-	return true;
-}
-
-bool ModList::moveModDown(int from)
-{
-	if (from < 0)
-		return false;
-	if (from < mods.size() - 1)
-		return moveModTo(from, from + 1);
-	return false;
-}
-
-bool ModList::moveModsDown(int first, int last)
-{
-	if (last == mods.size() - 1)
-		return false;
-
-	beginMoveRows(QModelIndex(), first, last, QModelIndex(), last + 2);
-	mods.move(last + 1, first);
-	endMoveRows();
-	saveListFile();
-	emit changed();
-	return true;
-}
-
-int ModList::columnCount(const QModelIndex &parent) const
-{
-	return 3;
-}
-
-QVariant ModList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	int row = index.row();
-	int column = index.column();
-
-	if (row < 0 || row >= mods.size())
-		return QVariant();
-
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (column)
-		{
-		case NameColumn:
-			return mods[row].name();
-		case VersionColumn:
-			return mods[row].version();
-
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-		return mods[row].mmc_id();
-
-	case Qt::CheckStateRole:
-		switch (column)
-		{
-		case ActiveColumn:
-			return mods[row].enabled() ? Qt::Checked : Qt::Unchecked;
-		default:
-			return QVariant();
-		}
-	default:
-		return QVariant();
-	}
-}
-
-bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-	if (index.row() < 0 || index.row() >= rowCount(index) || !index.isValid())
-	{
-		return false;
-	}
-
-	if (role == Qt::CheckStateRole)
-	{
-		auto &mod = mods[index.row()];
-		if (mod.enable(!mod.enabled()))
-		{
-			emit dataChanged(index, index);
-			return true;
-		}
-	}
-	return false;
-}
-
-QVariant ModList::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (section)
-		{
-		case ActiveColumn:
-			return QString();
-		case NameColumn:
-			return tr("Name");
-		case VersionColumn:
-			return tr("Version");
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-		switch (section)
-		{
-		case ActiveColumn:
-			return tr("Is the mod enabled?");
-		case NameColumn:
-			return tr("The name of the mod.");
-		case VersionColumn:
-			return tr("The version of the mod.");
-		default:
-			return QVariant();
-		}
-	default:
-		return QVariant();
-	}
-	return QVariant();
-}
-
-Qt::ItemFlags ModList::flags(const QModelIndex &index) const
-{
-	Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
-	if (index.isValid())
-		return Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled |
-			   defaultFlags;
-	else
-		return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-QStringList ModList::mimeTypes() const
-{
-	QStringList types;
-	types << "text/uri-list";
-	types << "text/plain";
-	return types;
-}
-
-Qt::DropActions ModList::supportedDropActions() const
-{
-	// copy from outside, move from within and other mod lists
-	return Qt::CopyAction | Qt::MoveAction;
-}
-
-Qt::DropActions ModList::supportedDragActions() const
-{
-	// move to other mod lists or VOID
-	return Qt::MoveAction;
-}
-
-QMimeData *ModList::mimeData(const QModelIndexList &indexes) const
-{
-	QMimeData *data = new QMimeData();
-
-	if (indexes.size() == 0)
-		return data;
-
-	auto idx = indexes[0];
-	int row = idx.row();
-	if (row < 0 || row >= mods.size())
-		return data;
-
-	QStringList params;
-	params << m_list_id << QString::number(row);
-	data->setText(params.join('|'));
-	return data;
-}
-
-bool ModList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-						   const QModelIndex &parent)
-{
-	if (action == Qt::IgnoreAction)
-		return true;
-	// check if the action is supported
-	if (!data || !(action & supportedDropActions()))
-		return false;
-	if (parent.isValid())
-	{
-		row = parent.row();
-		column = parent.column();
-	}
-
-	if (row > rowCount())
-		row = rowCount();
-	if (row == -1)
-		row = rowCount();
-	if (column == -1)
-		column = 0;
-	qDebug() << "Drop row: " << row << " column: " << column;
-
-	// files dropped from outside?
-	if (data->hasUrls())
-	{
-		bool was_watching = is_watching;
-		if (was_watching)
-			stopWatching();
-		auto urls = data->urls();
-		for (auto url : urls)
-		{
-			// only local files may be dropped...
-			if (!url.isLocalFile())
-				continue;
-			QString filename = url.toLocalFile();
-			installMod(filename, row);
-			// if there is no ordering, re-sort the list
-			if (m_list_file.isEmpty())
-			{
-				beginResetModel();
-				internalSort(mods);
-				endResetModel();
-			}
-		}
-		if (was_watching)
-			startWatching();
-		return true;
-	}
-	else if (data->hasText())
-	{
-		QString sourcestr = data->text();
-		auto list = sourcestr.split('|');
-		if (list.size() != 2)
-			return false;
-		QString remoteId = list[0];
-		int remoteIndex = list[1].toInt();
-		qDebug() << "move: " << sourcestr;
-		// no moving of things between two lists
-		if (remoteId != m_list_id)
-			return false;
-		// no point moving to the same place...
-		if (row == remoteIndex)
-			return false;
-		// otherwise, move the mod :D
-		moveModTo(remoteIndex, row);
-		return true;
-	}
-	return false;
-}
diff --git a/libraries/logic/minecraft/ModList.h b/libraries/logic/minecraft/ModList.h
deleted file mode 100644
index 05ada8ee..00000000
--- a/libraries/logic/minecraft/ModList.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QList>
-#include <QString>
-#include <QDir>
-#include <QAbstractListModel>
-
-#include "minecraft/Mod.h"
-
-#include "multimc_logic_export.h"
-
-class LegacyInstance;
-class BaseInstance;
-class QFileSystemWatcher;
-
-/**
- * A legacy mod list.
- * Backed by a folder.
- */
-class MULTIMC_LOGIC_EXPORT ModList : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	enum Columns
-	{
-		ActiveColumn = 0,
-		NameColumn,
-		VersionColumn
-	};
-	ModList(const QString &dir, const QString &list_file = QString());
-
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-	virtual bool setData(const QModelIndex &index, const QVariant &value,
-						 int role = Qt::EditRole);
-
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const
-	{
-		return size();
-	}
-	;
-	virtual QVariant headerData(int section, Qt::Orientation orientation,
-								int role = Qt::DisplayRole) const;
-	virtual int columnCount(const QModelIndex &parent) const;
-
-	size_t size() const
-	{
-		return mods.size();
-	}
-	;
-	bool empty() const
-	{
-		return size() == 0;
-	}
-	Mod &operator[](size_t index)
-	{
-		return mods[index];
-	}
-
-	/// Reloads the mod list and returns true if the list changed.
-	virtual bool update();
-
-	/**
-	 * Adds the given mod to the list at the given index - if the list supports custom ordering
-	 */
-	virtual bool installMod(const QString & filename, int index = 0);
-
-	/// Deletes the mod at the given index.
-	virtual bool deleteMod(int index);
-
-	/// Deletes all the selected mods
-	virtual bool deleteMods(int first, int last);
-
-	/**
-	 * move the mod at index to the position N
-	 * 0 is the beginning of the list, length() is the end of the list.
-	 */
-	virtual bool moveModTo(int from, int to);
-
-	/**
-	 * move the mod at index one position upwards
-	 */
-	virtual bool moveModUp(int from);
-	virtual bool moveModsUp(int first, int last);
-
-	/**
-	 * move the mod at index one position downwards
-	 */
-	virtual bool moveModDown(int from);
-	virtual bool moveModsDown(int first, int last);
-
-	/// flags, mostly to support drag&drop
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-	/// get data for drag action
-	virtual QMimeData *mimeData(const QModelIndexList &indexes) const;
-	/// get the supported mime types
-	virtual QStringList mimeTypes() const;
-	/// process data from drop action
-	virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-							  const QModelIndex &parent);
-	/// what drag actions do we support?
-	virtual Qt::DropActions supportedDragActions() const;
-
-	/// what drop actions do we support?
-	virtual Qt::DropActions supportedDropActions() const;
-
-	void startWatching();
-	void stopWatching();
-
-	virtual bool isValid();
-
-	QDir dir()
-	{
-		return m_dir;
-	}
-
-	const QList<Mod> & allMods()
-	{
-		return mods;
-	}
-
-private:
-	void internalSort(QList<Mod> & what);
-	struct OrderItem
-	{
-		QString id;
-		bool enabled = false;
-	};
-	typedef QList<OrderItem> OrderList;
-	OrderList readListFile();
-	bool saveListFile();
-private
-slots:
-	void directoryChanged(QString path);
-
-signals:
-	void changed();
-
-protected:
-	QFileSystemWatcher *m_watcher;
-	bool is_watching;
-	QDir m_dir;
-	QString m_list_file;
-	QString m_list_id;
-	QList<Mod> mods;
-};
diff --git a/libraries/logic/minecraft/MojangDownloadInfo.h b/libraries/logic/minecraft/MojangDownloadInfo.h
deleted file mode 100644
index 1f3306e0..00000000
--- a/libraries/logic/minecraft/MojangDownloadInfo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-#include <QString>
-#include <QMap>
-#include <memory>
-
-struct MojangDownloadInfo
-{
-	// types
-	typedef std::shared_ptr<MojangDownloadInfo> Ptr;
-
-	// data
-	/// Local filesystem path. WARNING: not used, only here so we can pass through mojang files unmolested!
-	QString path;
-	/// absolute URL of this file
-	QString url;
-	/// sha-1 checksum of the file
-	QString sha1;
-	/// size of the file in bytes
-	int size;
-};
-
-
-
-struct MojangLibraryDownloadInfo
-{
-	MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact): artifact(artifact) {};
-	MojangLibraryDownloadInfo() {};
-
-	// types
-	typedef std::shared_ptr<MojangLibraryDownloadInfo> Ptr;
-
-	// methods
-	MojangDownloadInfo *getDownloadInfo(QString classifier)
-	{
-		if (classifier.isNull())
-		{
-			return artifact.get();
-		}
-		
-		return classifiers[classifier].get();
-	}
-
-	// data
-	MojangDownloadInfo::Ptr artifact;
-	QMap<QString, MojangDownloadInfo::Ptr> classifiers;
-};
-
-
-
-struct MojangAssetIndexInfo : public MojangDownloadInfo
-{
-	// types
-	typedef std::shared_ptr<MojangAssetIndexInfo> Ptr;
-
-	// methods
-	MojangAssetIndexInfo()
-	{
-	}
-
-	MojangAssetIndexInfo(QString id)
-	{
-		this->id = id;
-		url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id + ".json";
-		known = false;
-	}
-
-	// data
-	int totalSize;
-	QString id;
-	bool known = true;
-};
diff --git a/libraries/logic/minecraft/MojangVersionFormat.cpp b/libraries/logic/minecraft/MojangVersionFormat.cpp
deleted file mode 100644
index 34129c9e..00000000
--- a/libraries/logic/minecraft/MojangVersionFormat.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-#include "MojangVersionFormat.h"
-#include "onesix/OneSixVersionFormat.h"
-#include "MinecraftVersion.h"
-#include "VersionBuildError.h"
-#include "MojangDownloadInfo.h"
-
-#include "Json.h"
-using namespace Json;
-#include "ParseUtils.h"
-
-static const int CURRENT_MINIMUM_LAUNCHER_VERSION = 18;
-
-static MojangAssetIndexInfo::Ptr assetIndexFromJson (const QJsonObject &obj);
-static MojangDownloadInfo::Ptr downloadInfoFromJson (const QJsonObject &obj);
-static MojangLibraryDownloadInfo::Ptr libDownloadInfoFromJson (const QJsonObject &libObj);
-static QJsonObject assetIndexToJson (MojangAssetIndexInfo::Ptr assetidxinfo);
-static QJsonObject libDownloadInfoToJson (MojangLibraryDownloadInfo::Ptr libinfo);
-static QJsonObject downloadInfoToJson (MojangDownloadInfo::Ptr info);
-
-namespace Bits
-{
-static void readString(const QJsonObject &root, const QString &key, QString &variable)
-{
-	if (root.contains(key))
-	{
-		variable = requireString(root.value(key));
-	}
-}
-
-static void readDownloadInfo(MojangDownloadInfo::Ptr out, const QJsonObject &obj)
-{
-	// optional, not used
-	readString(obj, "path", out->path);
-	// required!
-	out->sha1 = requireString(obj, "sha1");
-	out->url = requireString(obj, "url");
-	out->size = requireInteger(obj, "size");
-}
-
-static void readAssetIndex(MojangAssetIndexInfo::Ptr out, const QJsonObject &obj)
-{
-	out->totalSize = requireInteger(obj, "totalSize");
-	out->id = requireString(obj, "id");
-	// out->known = true;
-}
-}
-
-MojangDownloadInfo::Ptr downloadInfoFromJson(const QJsonObject &obj)
-{
-	auto out = std::make_shared<MojangDownloadInfo>();
-	Bits::readDownloadInfo(out, obj);
-	return out;
-}
-
-MojangAssetIndexInfo::Ptr assetIndexFromJson(const QJsonObject &obj)
-{
-	auto out = std::make_shared<MojangAssetIndexInfo>();
-	Bits::readDownloadInfo(out, obj);
-	Bits::readAssetIndex(out, obj);
-	return out;
-}
-
-QJsonObject downloadInfoToJson(MojangDownloadInfo::Ptr info)
-{
-	QJsonObject out;
-	if(!info->path.isNull())
-	{
-		out.insert("path", info->path);
-	}
-	out.insert("sha1", info->sha1);
-	out.insert("size", info->size);
-	out.insert("url", info->url);
-	return out;
-}
-
-MojangLibraryDownloadInfo::Ptr libDownloadInfoFromJson(const QJsonObject &libObj)
-{
-	auto out = std::make_shared<MojangLibraryDownloadInfo>();
-	auto dlObj = requireObject(libObj.value("downloads"));
-	if(dlObj.contains("artifact"))
-	{
-		out->artifact = downloadInfoFromJson(requireObject(dlObj, "artifact"));
-	}
-	if(dlObj.contains("classifiers"))
-	{
-		auto classifiersObj = requireObject(dlObj, "classifiers");
-		for(auto iter = classifiersObj.begin(); iter != classifiersObj.end(); iter++)
-		{
-			auto classifier = iter.key();
-			auto classifierObj = requireObject(iter.value());
-			out->classifiers[classifier] = downloadInfoFromJson(classifierObj);
-		}
-	}
-	return out;
-}
-
-QJsonObject libDownloadInfoToJson(MojangLibraryDownloadInfo::Ptr libinfo)
-{
-	QJsonObject out;
-	if(libinfo->artifact)
-	{
-		out.insert("artifact", downloadInfoToJson(libinfo->artifact));
-	}
-	if(libinfo->classifiers.size())
-	{
-		QJsonObject classifiersOut;
-		for(auto iter = libinfo->classifiers.begin(); iter != libinfo->classifiers.end(); iter++)
-		{
-			classifiersOut.insert(iter.key(), downloadInfoToJson(iter.value()));
-		}
-		out.insert("classifiers", classifiersOut);
-	}
-	return out;
-}
-
-QJsonObject assetIndexToJson(MojangAssetIndexInfo::Ptr info)
-{
-	QJsonObject out;
-	if(!info->path.isNull())
-	{
-		out.insert("path", info->path);
-	}
-	out.insert("sha1", info->sha1);
-	out.insert("size", info->size);
-	out.insert("url", info->url);
-	out.insert("totalSize", info->totalSize);
-	out.insert("id", info->id);
-	return out;
-}
-
-void MojangVersionFormat::readVersionProperties(const QJsonObject &in, VersionFile *out)
-{
-	Bits::readString(in, "id", out->minecraftVersion);
-	Bits::readString(in, "mainClass", out->mainClass);
-	Bits::readString(in, "minecraftArguments", out->minecraftArguments);
-	if(out->minecraftArguments.isEmpty())
-	{
-		QString processArguments;
-		Bits::readString(in, "processArguments", processArguments);
-		QString toCompare = processArguments.toLower();
-		if (toCompare == "legacy")
-		{
-			out->minecraftArguments = " ${auth_player_name} ${auth_session}";
-		}
-		else if (toCompare == "username_session")
-		{
-			out->minecraftArguments = "--username ${auth_player_name} --session ${auth_session}";
-		}
-		else if (toCompare == "username_session_version")
-		{
-			out->minecraftArguments = "--username ${auth_player_name} --session ${auth_session} --version ${profile_name}";
-		}
-		else if (!toCompare.isEmpty())
-		{
-			out->addProblem(PROBLEM_ERROR, QObject::tr("processArguments is set to unknown value '%1'").arg(processArguments));
-		}
-	}
-	Bits::readString(in, "type", out->type);
-
-	Bits::readString(in, "assets", out->assets);
-	if(in.contains("assetIndex"))
-	{
-		out->mojangAssetIndex = assetIndexFromJson(requireObject(in, "assetIndex"));
-	}
-	else if (!out->assets.isNull())
-	{
-		out->mojangAssetIndex = std::make_shared<MojangAssetIndexInfo>(out->assets);
-	}
-
-	out->m_releaseTime = timeFromS3Time(in.value("releaseTime").toString(""));
-	out->m_updateTime = timeFromS3Time(in.value("time").toString(""));
-
-	if (in.contains("minimumLauncherVersion"))
-	{
-		out->minimumLauncherVersion = requireInteger(in.value("minimumLauncherVersion"));
-		if (out->minimumLauncherVersion > CURRENT_MINIMUM_LAUNCHER_VERSION)
-		{
-			out->addProblem(
-				PROBLEM_WARNING,
-				QObject::tr("The 'minimumLauncherVersion' value of this version (%1) is higher than supported by MultiMC (%2). It might not work properly!")
-					.arg(out->minimumLauncherVersion)
-					.arg(CURRENT_MINIMUM_LAUNCHER_VERSION));
-		}
-	}
-	if(in.contains("downloads"))
-	{
-		auto downloadsObj = requireObject(in, "downloads");
-		for(auto iter = downloadsObj.begin(); iter != downloadsObj.end(); iter++)
-		{
-			auto classifier = iter.key();
-			auto classifierObj = requireObject(iter.value());
-			out->mojangDownloads[classifier] = downloadInfoFromJson(classifierObj);
-		}
-	}
-}
-
-VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc, const QString &filename)
-{
-	VersionFilePtr out(new VersionFile());
-	if (doc.isEmpty() || doc.isNull())
-	{
-		throw JSONValidationError(filename + " is empty or null");
-	}
-	if (!doc.isObject())
-	{
-		throw JSONValidationError(filename + " is not an object");
-	}
-
-	QJsonObject root = doc.object();
-
-	readVersionProperties(root, out.get());
-
-	out->name = "Minecraft";
-	out->fileId = "net.minecraft";
-	out->version = out->minecraftVersion;
-	out->filename = filename;
-
-
-	if (root.contains("libraries"))
-	{
-		for (auto libVal : requireArray(root.value("libraries")))
-		{
-			auto libObj = requireObject(libVal);
-
-			auto lib = MojangVersionFormat::libraryFromJson(libObj, filename);
-			out->libraries.append(lib);
-		}
-	}
-	return out;
-}
-
-void MojangVersionFormat::writeVersionProperties(const VersionFile* in, QJsonObject& out)
-{
-	writeString(out, "id", in->minecraftVersion);
-	writeString(out, "mainClass", in->mainClass);
-	writeString(out, "minecraftArguments", in->minecraftArguments);
-	writeString(out, "type", in->type);
-	if(!in->m_releaseTime.isNull())
-	{
-		writeString(out, "releaseTime", timeToS3Time(in->m_releaseTime));
-	}
-	if(!in->m_updateTime.isNull())
-	{
-		writeString(out, "time", timeToS3Time(in->m_updateTime));
-	}
-	if(in->minimumLauncherVersion != -1)
-	{
-		out.insert("minimumLauncherVersion", in->minimumLauncherVersion);
-	}
-	writeString(out, "assets", in->assets);
-	if(in->mojangAssetIndex && in->mojangAssetIndex->known)
-	{
-		out.insert("assetIndex", assetIndexToJson(in->mojangAssetIndex));
-	}
-	if(in->mojangDownloads.size())
-	{
-		QJsonObject downloadsOut;
-		for(auto iter = in->mojangDownloads.begin(); iter != in->mojangDownloads.end(); iter++)
-		{
-			downloadsOut.insert(iter.key(), downloadInfoToJson(iter.value()));
-		}
-		out.insert("downloads", downloadsOut);
-	}
-}
-
-QJsonDocument MojangVersionFormat::versionFileToJson(const VersionFilePtr &patch)
-{
-	QJsonObject root;
-	writeVersionProperties(patch.get(), root);
-	if (!patch->libraries.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->libraries)
-		{
-			array.append(MojangVersionFormat::libraryToJson(value.get()));
-		}
-		root.insert("libraries", array);
-	}
-
-	// write the contents to a json document.
-	{
-		QJsonDocument out;
-		out.setObject(root);
-		return out;
-	}
-}
-
-LibraryPtr MojangVersionFormat::libraryFromJson(const QJsonObject &libObj, const QString &filename)
-{
-	LibraryPtr out(new Library());
-	if (!libObj.contains("name"))
-	{
-		throw JSONValidationError(filename + "contains a library that doesn't have a 'name' field");
-	}
-	out->m_name = libObj.value("name").toString();
-
-	Bits::readString(libObj, "url", out->m_repositoryURL);
-	if (libObj.contains("extract"))
-	{
-		out->m_hasExcludes = true;
-		auto extractObj = requireObject(libObj.value("extract"));
-		for (auto excludeVal : requireArray(extractObj.value("exclude")))
-		{
-			out->m_extractExcludes.append(requireString(excludeVal));
-		}
-	}
-	if (libObj.contains("natives"))
-	{
-		QJsonObject nativesObj = requireObject(libObj.value("natives"));
-		for (auto it = nativesObj.begin(); it != nativesObj.end(); ++it)
-		{
-			if (!it.value().isString())
-			{
-				qWarning() << filename << "contains an invalid native (skipping)";
-			}
-			OpSys opSys = OpSys_fromString(it.key());
-			if (opSys != Os_Other)
-			{
-				out->m_nativeClassifiers[opSys] = it.value().toString();
-			}
-		}
-	}
-	if (libObj.contains("rules"))
-	{
-		out->applyRules = true;
-		out->m_rules = rulesFromJsonV4(libObj);
-	}
-	if (libObj.contains("downloads"))
-	{
-		out->m_mojangDownloads = libDownloadInfoFromJson(libObj);
-	}
-	return out;
-}
-
-QJsonObject MojangVersionFormat::libraryToJson(Library *library)
-{
-	QJsonObject libRoot;
-	libRoot.insert("name", (QString)library->m_name);
-	if (!library->m_repositoryURL.isEmpty())
-	{
-		libRoot.insert("url", library->m_repositoryURL);
-	}
-	if (library->isNative())
-	{
-		QJsonObject nativeList;
-		auto iter = library->m_nativeClassifiers.begin();
-		while (iter != library->m_nativeClassifiers.end())
-		{
-			nativeList.insert(OpSys_toString(iter.key()), iter.value());
-			iter++;
-		}
-		libRoot.insert("natives", nativeList);
-		if (library->m_extractExcludes.size())
-		{
-			QJsonArray excludes;
-			QJsonObject extract;
-			for (auto exclude : library->m_extractExcludes)
-			{
-				excludes.append(exclude);
-			}
-			extract.insert("exclude", excludes);
-			libRoot.insert("extract", extract);
-		}
-	}
-	if (library->m_rules.size())
-	{
-		QJsonArray allRules;
-		for (auto &rule : library->m_rules)
-		{
-			QJsonObject ruleObj = rule->toJson();
-			allRules.append(ruleObj);
-		}
-		libRoot.insert("rules", allRules);
-	}
-	if(library->m_mojangDownloads)
-	{
-		auto downloadsObj = libDownloadInfoToJson(library->m_mojangDownloads);
-		libRoot.insert("downloads", downloadsObj);
-	}
-	return libRoot;
-}
diff --git a/libraries/logic/minecraft/MojangVersionFormat.h b/libraries/logic/minecraft/MojangVersionFormat.h
deleted file mode 100644
index 4e141088..00000000
--- a/libraries/logic/minecraft/MojangVersionFormat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <minecraft/VersionFile.h>
-#include <minecraft/Library.h>
-#include <QJsonDocument>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT MojangVersionFormat
-{
-friend class OneSixVersionFormat;
-protected:
-	// does not include libraries
-	static void readVersionProperties(const QJsonObject& in, VersionFile* out);
-	// does not include libraries
-	static void writeVersionProperties(const VersionFile* in, QJsonObject& out);
-public:
-	// version files / profile patches
-	static VersionFilePtr versionFileFromJson(const QJsonDocument &doc, const QString &filename);
-	static QJsonDocument versionFileToJson(const VersionFilePtr &patch);
-
-	// libraries
-	static LibraryPtr libraryFromJson(const QJsonObject &libObj, const QString &filename);
-	static QJsonObject libraryToJson(Library *library);
-};
diff --git a/libraries/logic/minecraft/OpSys.cpp b/libraries/logic/minecraft/OpSys.cpp
deleted file mode 100644
index 4c2a236d..00000000
--- a/libraries/logic/minecraft/OpSys.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "OpSys.h"
-
-OpSys OpSys_fromString(QString name)
-{
-	if (name == "linux")
-		return Os_Linux;
-	if (name == "windows")
-		return Os_Windows;
-	if (name == "osx")
-		return Os_OSX;
-	return Os_Other;
-}
-
-QString OpSys_toString(OpSys name)
-{
-	switch (name)
-	{
-	case Os_Linux:
-		return "linux";
-	case Os_OSX:
-		return "osx";
-	case Os_Windows:
-		return "windows";
-	default:
-		return "other";
-	}
-}
\ No newline at end of file
diff --git a/libraries/logic/minecraft/ParseUtils.cpp b/libraries/logic/minecraft/ParseUtils.cpp
deleted file mode 100644
index ca188432..00000000
--- a/libraries/logic/minecraft/ParseUtils.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <QDateTime>
-#include <QString>
-#include "ParseUtils.h"
-#include <QDebug>
-#include <cstdlib>
-
-QDateTime timeFromS3Time(QString str)
-{
-	return QDateTime::fromString(str, Qt::ISODate);
-}
-
-QString timeToS3Time(QDateTime time)
-{
-	// this all because Qt can't format timestamps right.
-	int offsetRaw = time.offsetFromUtc();
-	bool negative = offsetRaw < 0;
-	int offsetAbs = std::abs(offsetRaw);
-
-	int offsetSeconds = offsetAbs % 60;
-	offsetAbs -= offsetSeconds;
-
-	int offsetMinutes = offsetAbs % 3600;
-	offsetAbs -= offsetMinutes;
-	offsetMinutes /= 60;
-	
-	int offsetHours = offsetAbs / 3600;
-
-	QString raw = time.toString("yyyy-MM-ddTHH:mm:ss");
-	raw += (negative ? QChar('-') : QChar('+'));
-	raw += QString("%1").arg(offsetHours, 2, 10, QChar('0'));
-	raw += ":";
-	raw += QString("%1").arg(offsetMinutes, 2, 10, QChar('0'));
-	return raw;
-}
diff --git a/libraries/logic/minecraft/ParseUtils.h b/libraries/logic/minecraft/ParseUtils.h
deleted file mode 100644
index 2b367a10..00000000
--- a/libraries/logic/minecraft/ParseUtils.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-#include <QString>
-#include <QDateTime>
-
-#include "multimc_logic_export.h"
-
-/// take the timestamp used by S3 and turn it into QDateTime
-MULTIMC_LOGIC_EXPORT QDateTime timeFromS3Time(QString str);
-
-/// take a timestamp and convert it into an S3 timestamp
-MULTIMC_LOGIC_EXPORT QString timeToS3Time(QDateTime);
diff --git a/libraries/logic/minecraft/ProfilePatch.h b/libraries/logic/minecraft/ProfilePatch.h
deleted file mode 100644
index f0c65360..00000000
--- a/libraries/logic/minecraft/ProfilePatch.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <QList>
-#include <QJsonDocument>
-#include <QDateTime>
-#include "JarMod.h"
-
-class MinecraftProfile;
-
-enum ProblemSeverity
-{
-	PROBLEM_NONE,
-	PROBLEM_WARNING,
-	PROBLEM_ERROR
-};
-
-/// where is a version from?
-enum VersionSource
-{
-	Local, //!< version loaded from a file in the cache.
-	Remote, //!< incomplete version on a remote server.
-};
-
-class PatchProblem
-{
-public:
-	PatchProblem(ProblemSeverity severity, const QString & description)
-	{
-		m_severity = severity;
-		m_description = description;
-	}
-	const QString & getDescription() const
-	{
-		return m_description;
-	}
-	const ProblemSeverity getSeverity() const
-	{
-		return m_severity;
-	}
-private:
-	ProblemSeverity m_severity;
-	QString m_description;
-};
-
-class ProfilePatch : public std::enable_shared_from_this<ProfilePatch>
-{
-public:
-	virtual ~ProfilePatch(){};
-	virtual void applyTo(MinecraftProfile *profile) = 0;
-
-	virtual bool isMinecraftVersion() = 0;
-	virtual bool hasJarMods() = 0;
-	virtual QList<JarmodPtr> getJarMods() = 0;
-
-	virtual bool isMoveable() = 0;
-	virtual bool isCustomizable() = 0;
-	virtual bool isRevertible() = 0;
-	virtual bool isRemovable() = 0;
-	virtual bool isCustom() = 0;
-	virtual bool isEditable() = 0;
-	virtual bool isVersionChangeable() = 0;
-
-	virtual void setOrder(int order) = 0;
-	virtual int getOrder() = 0;
-
-	virtual QString getID() = 0;
-	virtual QString getName() = 0;
-	virtual QString getVersion() = 0;
-	virtual QDateTime getReleaseDateTime() = 0;
-
-	virtual QString getFilename() = 0;
-
-	virtual VersionSource getVersionSource() = 0;
-
-	virtual std::shared_ptr<class VersionFile> getVersionFile() = 0;
-
-	virtual const QList<PatchProblem>& getProblems()
-	{
-		return m_problems;
-	}
-	virtual void addProblem(ProblemSeverity severity, const QString &description)
-	{
-		if(severity > m_problemSeverity)
-		{
-			m_problemSeverity = severity;
-		}
-		m_problems.append(PatchProblem(severity, description));
-	}
-	virtual ProblemSeverity getProblemSeverity()
-	{
-		return m_problemSeverity;
-	}
-	virtual bool hasFailed()
-	{
-		return getProblemSeverity() == PROBLEM_ERROR;
-	}
-
-protected:
-	QList<PatchProblem> m_problems;
-	ProblemSeverity m_problemSeverity = PROBLEM_NONE;
-};
-
-typedef std::shared_ptr<ProfilePatch> ProfilePatchPtr;
diff --git a/libraries/logic/minecraft/ProfileStrategy.h b/libraries/logic/minecraft/ProfileStrategy.h
deleted file mode 100644
index b4dfc4b3..00000000
--- a/libraries/logic/minecraft/ProfileStrategy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "ProfileUtils.h"
-
-class MinecraftProfile;
-
-class ProfileStrategy
-{
-	friend class MinecraftProfile;
-public:
-	virtual ~ProfileStrategy(){};
-
-	/// load the patch files into the profile
-	virtual void load() = 0;
-
-	/// reset the order of patches
-	virtual bool resetOrder() = 0;
-
-	/// save the order of patches, given the order
-	virtual bool saveOrder(ProfileUtils::PatchOrder order) = 0;
-
-	/// install a list of jar mods into the instance
-	virtual bool installJarMods(QStringList filepaths) = 0;
-
-	/// remove any files or records that constitute the version patch
-	virtual bool removePatch(ProfilePatchPtr jarMod) = 0;
-
-	/// make the patch custom, if possible
-	virtual bool customizePatch(ProfilePatchPtr patch) = 0;
-
-	/// revert the custom patch to 'vanilla', if possible
-	virtual bool revertPatch(ProfilePatchPtr patch) = 0;
-protected:
-	MinecraftProfile *profile;
-};
diff --git a/libraries/logic/minecraft/ProfileUtils.cpp b/libraries/logic/minecraft/ProfileUtils.cpp
deleted file mode 100644
index ef9b3b28..00000000
--- a/libraries/logic/minecraft/ProfileUtils.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "ProfileUtils.h"
-#include "minecraft/VersionFilterData.h"
-#include "minecraft/onesix/OneSixVersionFormat.h"
-#include "Json.h"
-#include <QDebug>
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QRegularExpression>
-#include <QSaveFile>
-
-namespace ProfileUtils
-{
-
-static const int currentOrderFileVersion = 1;
-
-bool writeOverrideOrders(QString path, const PatchOrder &order)
-{
-	QJsonObject obj;
-	obj.insert("version", currentOrderFileVersion);
-	QJsonArray orderArray;
-	for(auto str: order)
-	{
-		orderArray.append(str);
-	}
-	obj.insert("order", orderArray);
-	QSaveFile orderFile(path);
-	if (!orderFile.open(QFile::WriteOnly))
-	{
-		qCritical() << "Couldn't open" << orderFile.fileName()
-					 << "for writing:" << orderFile.errorString();
-		return false;
-	}
-	auto data = QJsonDocument(obj).toJson(QJsonDocument::Indented);
-	if(orderFile.write(data) != data.size())
-	{
-		qCritical() << "Couldn't write all the data into" << orderFile.fileName()
-					 << "because:" << orderFile.errorString();
-		return false;
-	}
-	if(!orderFile.commit())
-	{
-		qCritical() << "Couldn't save" << orderFile.fileName()
-					 << "because:" << orderFile.errorString();
-	}
-	return true;
-}
-
-bool readOverrideOrders(QString path, PatchOrder &order)
-{
-	QFile orderFile(path);
-	if (!orderFile.exists())
-	{
-		qWarning() << "Order file doesn't exist. Ignoring.";
-		return false;
-	}
-	if (!orderFile.open(QFile::ReadOnly))
-	{
-		qCritical() << "Couldn't open" << orderFile.fileName()
-					 << " for reading:" << orderFile.errorString();
-		qWarning() << "Ignoring overriden order";
-		return false;
-	}
-
-	// and it's valid JSON
-	QJsonParseError error;
-	QJsonDocument doc = QJsonDocument::fromJson(orderFile.readAll(), &error);
-	if (error.error != QJsonParseError::NoError)
-	{
-		qCritical() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString();
-		qWarning() << "Ignoring overriden order";
-		return false;
-	}
-
-	// and then read it and process it if all above is true.
-	try
-	{
-		auto obj = Json::requireObject(doc);
-		// check order file version.
-		auto version = Json::requireInteger(obj.value("version"));
-		if (version != currentOrderFileVersion)
-		{
-			throw JSONValidationError(QObject::tr("Invalid order file version, expected %1")
-										  .arg(currentOrderFileVersion));
-		}
-		auto orderArray = Json::requireArray(obj.value("order"));
-		for(auto item: orderArray)
-		{
-			order.append(Json::requireString(item));
-		}
-	}
-	catch (JSONValidationError &err)
-	{
-		qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
-		qWarning() << "Ignoring overriden order";
-		order.clear();
-		return false;
-	}
-	return true;
-}
-
-static VersionFilePtr createErrorVersionFile(QString fileId, QString filepath, QString error)
-{
-	auto outError = std::make_shared<VersionFile>();
-	outError->fileId = outError->name = fileId;
-	outError->filename = filepath;
-	outError->addProblem(PROBLEM_ERROR, error);
-	return outError;
-}
-
-static VersionFilePtr guardedParseJson(const QJsonDocument & doc,const QString &fileId,const QString &filepath,const bool &requireOrder)
-{
-	try
-	{
-		return OneSixVersionFormat::versionFileFromJson(doc, filepath, requireOrder);
-	}
-	catch (Exception & e)
-	{
-		return createErrorVersionFile(fileId, filepath, e.cause());
-	}
-}
-
-VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder)
-{
-	QFile file(fileInfo.absoluteFilePath());
-	if (!file.open(QFile::ReadOnly))
-	{
-		auto errorStr = QObject::tr("Unable to open the version file %1: %2.").arg(fileInfo.fileName(), file.errorString());
-		return createErrorVersionFile(fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), errorStr);
-	}
-	QJsonParseError error;
-	auto data = file.readAll();
-	QJsonDocument doc = QJsonDocument::fromJson(data, &error);
-	file.close();
-	if (error.error != QJsonParseError::NoError)
-	{
-		int line = 1;
-		int column = 0;
-		for(int i = 0; i < error.offset; i++)
-		{
-			if(data[i] == '\n')
-			{
-				line++;
-				column = 0;
-				continue;
-			}
-			column++;
-		}
-		auto errorStr = QObject::tr("Unable to process the version file %1: %2 at line %3 column %4.")
-				.arg(fileInfo.fileName(), error.errorString())
-				.arg(line).arg(column);
-		return createErrorVersionFile(fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), errorStr);
-	}
-	return guardedParseJson(doc, fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), requireOrder);
-}
-
-VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
-{
-	QFile file(fileInfo.absoluteFilePath());
-	if (!file.open(QFile::ReadOnly))
-	{
-		auto errorStr = QObject::tr("Unable to open the version file %1: %2.").arg(fileInfo.fileName(), file.errorString());
-		return createErrorVersionFile(fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), errorStr);
-	}
-	QJsonDocument doc = QJsonDocument::fromBinaryData(file.readAll());
-	file.close();
-	if (doc.isNull())
-	{
-		file.remove();
-		throw JSONValidationError(QObject::tr("Unable to process the version file %1.").arg(fileInfo.fileName()));
-	}
-	return guardedParseJson(doc, fileInfo.completeBaseName(), fileInfo.absoluteFilePath(), false);
-}
-
-void removeLwjglFromPatch(VersionFilePtr patch)
-{
-	auto filter = [](QList<LibraryPtr>& libs)
-	{
-		QList<LibraryPtr> filteredLibs;
-		for (auto lib : libs)
-		{
-			if (!g_VersionFilterData.lwjglWhitelist.contains(lib->artifactPrefix()))
-			{
-				filteredLibs.append(lib);
-			}
-		}
-		libs = filteredLibs;
-	};
-	filter(patch->libraries);
-}
-}
diff --git a/libraries/logic/minecraft/ProfileUtils.h b/libraries/logic/minecraft/ProfileUtils.h
deleted file mode 100644
index 267fd42b..00000000
--- a/libraries/logic/minecraft/ProfileUtils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include "Library.h"
-#include "VersionFile.h"
-
-namespace ProfileUtils
-{
-typedef QStringList PatchOrder;
-
-/// Read and parse a OneSix format order file
-bool readOverrideOrders(QString path, PatchOrder &order);
-
-/// Write a OneSix format order file
-bool writeOverrideOrders(QString path, const PatchOrder &order);
-
-
-/// Parse a version file in JSON format
-VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder);
-
-/// Parse a version file in binary JSON format
-VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo);
-
-/// Remove LWJGL from a patch file. This is applied to all Mojang-like profile files.
-void removeLwjglFromPatch(VersionFilePtr patch);
-
-}
diff --git a/libraries/logic/minecraft/Rule.cpp b/libraries/logic/minecraft/Rule.cpp
deleted file mode 100644
index c8ba297b..00000000
--- a/libraries/logic/minecraft/Rule.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QJsonObject>
-#include <QJsonArray>
-
-#include "Rule.h"
-
-RuleAction RuleAction_fromString(QString name)
-{
-	if (name == "allow")
-		return Allow;
-	if (name == "disallow")
-		return Disallow;
-	return Defer;
-}
-
-QList<std::shared_ptr<Rule>> rulesFromJsonV4(const QJsonObject &objectWithRules)
-{
-	QList<std::shared_ptr<Rule>> rules;
-	auto rulesVal = objectWithRules.value("rules");
-	if (!rulesVal.isArray())
-		return rules;
-
-	QJsonArray ruleList = rulesVal.toArray();
-	for (auto ruleVal : ruleList)
-	{
-		std::shared_ptr<Rule> rule;
-		if (!ruleVal.isObject())
-			continue;
-		auto ruleObj = ruleVal.toObject();
-		auto actionVal = ruleObj.value("action");
-		if (!actionVal.isString())
-			continue;
-		auto action = RuleAction_fromString(actionVal.toString());
-		if (action == Defer)
-			continue;
-
-		auto osVal = ruleObj.value("os");
-		if (!osVal.isObject())
-		{
-			// add a new implicit action rule
-			rules.append(ImplicitRule::create(action));
-			continue;
-		}
-
-		auto osObj = osVal.toObject();
-		auto osNameVal = osObj.value("name");
-		if (!osNameVal.isString())
-			continue;
-		OpSys requiredOs = OpSys_fromString(osNameVal.toString());
-		QString versionRegex = osObj.value("version").toString();
-		// add a new OS rule
-		rules.append(OsRule::create(action, requiredOs, versionRegex));
-	}
-    return rules;
-}
-
-QJsonObject ImplicitRule::toJson()
-{
-	QJsonObject ruleObj;
-	ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
-	return ruleObj;
-}
-
-QJsonObject OsRule::toJson()
-{
-	QJsonObject ruleObj;
-	ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
-	QJsonObject osObj;
-	{
-		osObj.insert("name", OpSys_toString(m_system));
-		if(!m_version_regexp.isEmpty())
-		{
-			osObj.insert("version", m_version_regexp);
-		}
-	}
-	ruleObj.insert("os", osObj);
-	return ruleObj;
-}
-
diff --git a/libraries/logic/minecraft/Rule.h b/libraries/logic/minecraft/Rule.h
deleted file mode 100644
index c8bf6eaa..00000000
--- a/libraries/logic/minecraft/Rule.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QList>
-#include <QJsonObject>
-#include <memory>
-#include "OpSys.h"
-
-class Library;
-class Rule;
-
-enum RuleAction
-{
-	Allow,
-	Disallow,
-	Defer
-};
-
-QList<std::shared_ptr<Rule>> rulesFromJsonV4(const QJsonObject &objectWithRules);
-
-class Rule
-{
-protected:
-	RuleAction m_result;
-	virtual bool applies(const Library *parent) = 0;
-
-public:
-	Rule(RuleAction result) : m_result(result)
-	{
-	}
-	virtual ~Rule() {};
-	virtual QJsonObject toJson() = 0;
-	RuleAction apply(const Library *parent)
-	{
-		if (applies(parent))
-			return m_result;
-		else
-			return Defer;
-	}
-};
-
-class OsRule : public Rule
-{
-private:
-	// the OS
-	OpSys m_system;
-	// the OS version regexp
-	QString m_version_regexp;
-
-protected:
-	virtual bool applies(const Library *)
-	{
-		return (m_system == currentSystem);
-	}
-	OsRule(RuleAction result, OpSys system, QString version_regexp)
-		: Rule(result), m_system(system), m_version_regexp(version_regexp)
-	{
-	}
-
-public:
-	virtual QJsonObject toJson();
-	static std::shared_ptr<OsRule> create(RuleAction result, OpSys system,
-										  QString version_regexp)
-	{
-		return std::shared_ptr<OsRule>(new OsRule(result, system, version_regexp));
-	}
-};
-
-class ImplicitRule : public Rule
-{
-protected:
-	virtual bool applies(const Library *)
-	{
-		return true;
-	}
-	ImplicitRule(RuleAction result) : Rule(result)
-	{
-	}
-
-public:
-	virtual QJsonObject toJson();
-	static std::shared_ptr<ImplicitRule> create(RuleAction result)
-	{
-		return std::shared_ptr<ImplicitRule>(new ImplicitRule(result));
-	}
-};
diff --git a/libraries/logic/minecraft/VersionBuildError.h b/libraries/logic/minecraft/VersionBuildError.h
deleted file mode 100644
index fda453e5..00000000
--- a/libraries/logic/minecraft/VersionBuildError.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "Exception.h"
-
-class VersionBuildError : public Exception
-{
-public:
-	explicit VersionBuildError(QString cause) : Exception(cause) {}
-	virtual ~VersionBuildError() noexcept
-	{
-	}
-};
-
-/**
- * the base version file was meant for a newer version of the vanilla launcher than we support
- */
-class LauncherVersionError : public VersionBuildError
-{
-public:
-	LauncherVersionError(int actual, int supported)
-		: VersionBuildError(QObject::tr(
-			  "The base version file of this instance was meant for a newer (%1) "
-			  "version of the vanilla launcher than this version of MultiMC supports (%2).")
-								.arg(actual)
-								.arg(supported)) {};
-	virtual ~LauncherVersionError() noexcept
-	{
-	}
-};
-
-/**
- * some patch was intended for a different version of minecraft
- */
-class MinecraftVersionMismatch : public VersionBuildError
-{
-public:
-	MinecraftVersionMismatch(QString fileId, QString mcVersion, QString parentMcVersion)
-		: VersionBuildError(QObject::tr("The patch %1 is for a different version of Minecraft "
-										"(%2) than that of the instance (%3).")
-								.arg(fileId)
-								.arg(mcVersion)
-								.arg(parentMcVersion)) {};
-	virtual ~MinecraftVersionMismatch() noexcept
-	{
-	}
-};
-
-/**
- * files required for the version are not (yet?) present
- */
-class VersionIncomplete : public VersionBuildError
-{
-public:
-	VersionIncomplete(QString missingPatch)
-		: VersionBuildError(QObject::tr("Version is incomplete: missing %1.")
-								.arg(missingPatch)) {};
-	virtual ~VersionIncomplete() noexcept
-	{
-	}
-};
diff --git a/libraries/logic/minecraft/VersionFile.cpp b/libraries/logic/minecraft/VersionFile.cpp
deleted file mode 100644
index 573c4cb4..00000000
--- a/libraries/logic/minecraft/VersionFile.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <QJsonArray>
-#include <QJsonDocument>
-
-#include <QDebug>
-
-#include "minecraft/VersionFile.h"
-#include "minecraft/Library.h"
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/JarMod.h"
-#include "ParseUtils.h"
-
-#include "VersionBuildError.h"
-#include <Version.h>
-
-bool VersionFile::isMinecraftVersion()
-{
-	return fileId == "net.minecraft";
-}
-
-bool VersionFile::hasJarMods()
-{
-	return !jarMods.isEmpty();
-}
-
-void VersionFile::applyTo(MinecraftProfile *profile)
-{
-	auto theirVersion = profile->getMinecraftVersion();
-	if (!theirVersion.isNull() && !dependsOnMinecraftVersion.isNull())
-	{
-		if (QRegExp(dependsOnMinecraftVersion, Qt::CaseInsensitive, QRegExp::Wildcard).indexIn(theirVersion) == -1)
-		{
-			throw MinecraftVersionMismatch(fileId, dependsOnMinecraftVersion, theirVersion);
-		}
-	}
-	profile->applyMinecraftVersion(minecraftVersion);
-	profile->applyMainClass(mainClass);
-	profile->applyAppletClass(appletClass);
-	profile->applyMinecraftArguments(minecraftArguments);
-	if (isMinecraftVersion())
-	{
-		profile->applyMinecraftVersionType(type);
-	}
-	profile->applyMinecraftAssets(mojangAssetIndex);
-	profile->applyTweakers(addTweakers);
-
-	profile->applyJarMods(jarMods);
-	profile->applyTraits(traits);
-
-	for (auto library : libraries)
-	{
-		profile->applyLibrary(library);
-	}
-	profile->applyProblemSeverity(getProblemSeverity());
-	auto iter = mojangDownloads.begin();
-	while(iter != mojangDownloads.end())
-	{
-		profile->applyMojangDownload(iter.key(), iter.value());
-		iter++;
-	}
-}
diff --git a/libraries/logic/minecraft/VersionFile.h b/libraries/logic/minecraft/VersionFile.h
deleted file mode 100644
index 1b692f0f..00000000
--- a/libraries/logic/minecraft/VersionFile.h
+++ /dev/null
@@ -1,195 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QStringList>
-#include <QDateTime>
-#include <QSet>
-
-#include <memory>
-#include "minecraft/OpSys.h"
-#include "minecraft/Rule.h"
-#include "ProfilePatch.h"
-#include "Library.h"
-#include "JarMod.h"
-
-class MinecraftProfile;
-class VersionFile;
-struct MojangDownloadInfo;
-struct MojangAssetIndexInfo;
-
-typedef std::shared_ptr<VersionFile> VersionFilePtr;
-class VersionFile : public ProfilePatch
-{
-	friend class MojangVersionFormat;
-	friend class OneSixVersionFormat;
-public: /* methods */
-	virtual void applyTo(MinecraftProfile *profile) override;
-	virtual bool isMinecraftVersion() override;
-	virtual bool hasJarMods() override;
-	virtual int getOrder() override
-	{
-		return order;
-	}
-	virtual void setOrder(int order) override
-	{
-		this->order = order;
-	}
-	virtual QList<JarmodPtr> getJarMods() override
-	{
-		return jarMods;
-	}
-	virtual QString getID() override
-	{
-		return fileId;
-	}
-	virtual QString getName() override
-	{
-		return name;
-	}
-	virtual QString getVersion() override
-	{
-		return version;
-	}
-	virtual QString getFilename() override
-	{
-		return filename;
-	}
-	virtual QDateTime getReleaseDateTime() override
-	{
-		return m_releaseTime;
-	}
-	VersionSource getVersionSource() override
-	{
-		return Local;
-	}
-
-	std::shared_ptr<class VersionFile> getVersionFile() override
-	{
-		return std::dynamic_pointer_cast<VersionFile>(shared_from_this());
-	}
-
-	virtual bool isCustom() override
-	{
-		return !m_isVanilla;
-	};
-	virtual bool isCustomizable() override
-	{
-		return m_isCustomizable;
-	}
-	virtual bool isRemovable() override
-	{
-		return m_isRemovable;
-	}
-	virtual bool isRevertible() override
-	{
-		return m_isRevertible;
-	}
-    virtual bool isMoveable() override
-	{
-		return m_isMovable;
-	}
-    virtual bool isEditable() override
-	{
-		return isCustom();
-	}
-	virtual bool isVersionChangeable() override
-	{
-		return false;
-	}
-
-	void setVanilla (bool state)
-	{
-		m_isVanilla = state;
-	}
-	void setRemovable (bool state)
-	{
-		m_isRemovable = state;
-	}
-	void setRevertible (bool state)
-	{
-		m_isRevertible = state;
-	}
-	void setCustomizable (bool state)
-	{
-		m_isCustomizable = state;
-	}
-	void setMovable (bool state)
-	{
-		m_isMovable = state;
-	}
-
-
-public: /* data */
-	/// MultiMC: order hint for this version file if no explicit order is set
-	int order = 0;
-
-	// Flags for UI and version file manipulation in general
-	bool m_isVanilla = false;
-	bool m_isRemovable = false;
-	bool m_isRevertible = false;
-	bool m_isCustomizable = false;
-	bool m_isMovable = false;
-
-	/// MultiMC: filename of the file this was loaded from
-	QString filename;
-
-	/// MultiMC: human readable name of this package
-	QString name;
-
-	/// MultiMC: package ID of this package
-	QString fileId;
-
-	/// MultiMC: version of this package
-	QString version;
-
-	/// MultiMC: dependency on a Minecraft version
-	QString dependsOnMinecraftVersion;
-
-	/// Mojang: used to version the Mojang version format
-	int minimumLauncherVersion = -1;
-
-	/// Mojang: version of Minecraft this is
-	QString minecraftVersion;
-
-	/// Mojang: class to launch Minecraft with
-	QString mainClass;
-
-	/// MultiMC: DEPRECATED class to launch legacy Minecraft with (ambed in a custom window)
-	QString appletClass;
-
-	/// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
-	QString minecraftArguments;
-
-	/// Mojang: type of the Minecraft version
-	QString type;
-
-	/// Mojang: the time this version was actually released by Mojang
-	QDateTime m_releaseTime;
-
-	/// Mojang: the time this version was last updated by Mojang
-	QDateTime m_updateTime;
-
-	/// Mojang: DEPRECATED asset group to be used with Minecraft
-	QString assets;
-
-	/// MultiMC: list of tweaker mod arguments for launchwrapper
-	QStringList addTweakers;
-
-	/// Mojang: list of libraries to add to the version
-	QList<LibraryPtr> libraries;
-
-	/// MultiMC: list of attached traits of this version file - used to enable features
-	QSet<QString> traits;
-
-	/// MultiMC: list of jar mods added to this version
-	QList<JarmodPtr> jarMods;
-
-public:
-	// Mojang: list of 'downloads' - client jar, server jar, windows server exe, maybe more.
-	QMap <QString, std::shared_ptr<MojangDownloadInfo>> mojangDownloads;
-
-	// Mojang: extended asset index download information
-	std::shared_ptr<MojangAssetIndexInfo> mojangAssetIndex;
-};
-
-
diff --git a/libraries/logic/minecraft/VersionFilterData.cpp b/libraries/logic/minecraft/VersionFilterData.cpp
deleted file mode 100644
index 0c4a6e3d..00000000
--- a/libraries/logic/minecraft/VersionFilterData.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "VersionFilterData.h"
-#include "ParseUtils.h"
-
-VersionFilterData g_VersionFilterData = VersionFilterData();
-
-VersionFilterData::VersionFilterData()
-{
-	// 1.3.*
-	auto libs13 =
-		QList<FMLlib>{{"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b", false},
-					  {"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f", false},
-					  {"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82", false}};
-
-	fmlLibsMapping["1.3.2"] = libs13;
-
-	// 1.4.*
-	auto libs14 = QList<FMLlib>{
-		{"argo-2.25.jar", "bb672829fde76cb163004752b86b0484bd0a7f4b", false},
-		{"guava-12.0.1.jar", "b8e78b9af7bf45900e14c6f958486b6ca682195f", false},
-		{"asm-all-4.0.jar", "98308890597acb64047f7e896638e0d98753ae82", false},
-		{"bcprov-jdk15on-147.jar", "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb", false}};
-
-	fmlLibsMapping["1.4"] = libs14;
-	fmlLibsMapping["1.4.1"] = libs14;
-	fmlLibsMapping["1.4.2"] = libs14;
-	fmlLibsMapping["1.4.3"] = libs14;
-	fmlLibsMapping["1.4.4"] = libs14;
-	fmlLibsMapping["1.4.5"] = libs14;
-	fmlLibsMapping["1.4.6"] = libs14;
-	fmlLibsMapping["1.4.7"] = libs14;
-
-	// 1.5
-	fmlLibsMapping["1.5"] = QList<FMLlib>{
-		{"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-		{"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-		{"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-		{"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-		{"deobfuscation_data_1.5.zip", "5f7c142d53776f16304c0bbe10542014abad6af8", false},
-		{"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
-
-	// 1.5.1
-	fmlLibsMapping["1.5.1"] = QList<FMLlib>{
-		{"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-		{"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-		{"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-		{"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-		{"deobfuscation_data_1.5.1.zip", "22e221a0d89516c1f721d6cab056a7e37471d0a6", false},
-		{"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
-
-	// 1.5.2
-	fmlLibsMapping["1.5.2"] = QList<FMLlib>{
-		{"argo-small-3.2.jar", "58912ea2858d168c50781f956fa5b59f0f7c6b51", false},
-		{"guava-14.0-rc3.jar", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", false},
-		{"asm-all-4.1.jar", "054986e962b88d8660ae4566475658469595ef58", false},
-		{"bcprov-jdk15on-148.jar", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", true},
-		{"deobfuscation_data_1.5.2.zip", "446e55cd986582c70fcf12cb27bc00114c5adfd9", false},
-		{"scala-library.jar", "458d046151ad179c85429ed7420ffb1eaf6ddf85", true}};
-
-	// don't use installers for those.
-	forgeInstallerBlacklist = QSet<QString>({"1.5.2"});
-	// these won't show up in version lists because they are extremely bad and dangerous
-	legacyBlacklist = QSet<QString>({"rd-160052"});
-	/*
-	 * nothing older than this will be accepted from Mojang servers
-	 * (these versions need to be tested by us first)
-	 */
-	legacyCutoffDate = timeFromS3Time("2013-06-25T15:08:56+02:00");
-	lwjglWhitelist =
-		QSet<QString>{"net.java.jinput:jinput",	 "net.java.jinput:jinput-platform",
-					  "net.java.jutils:jutils",	 "org.lwjgl.lwjgl:lwjgl",
-					  "org.lwjgl.lwjgl:lwjgl_util", "org.lwjgl.lwjgl:lwjgl-platform"};
-
-	// Version list magic
-	recommendedMinecraftVersion = "1.7.10";
-}
diff --git a/libraries/logic/minecraft/VersionFilterData.h b/libraries/logic/minecraft/VersionFilterData.h
deleted file mode 100644
index f7d4ebe7..00000000
--- a/libraries/logic/minecraft/VersionFilterData.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-#include <QMap>
-#include <QString>
-#include <QSet>
-#include <QDateTime>
-
-#include "multimc_logic_export.h"
-
-struct FMLlib
-{
-	QString filename;
-	QString checksum;
-	bool ours;
-};
-
-struct VersionFilterData
-{
-	VersionFilterData();
-	// mapping between minecraft versions and FML libraries required
-	QMap<QString, QList<FMLlib>> fmlLibsMapping;
-	// set of minecraft versions for which using forge installers is blacklisted
-	QSet<QString> forgeInstallerBlacklist;
-	// set of 'legacy' versions that will not show up in the version lists.
-	QSet<QString> legacyBlacklist;
-	// no new versions below this date will be accepted from Mojang servers
-	QDateTime legacyCutoffDate;
-	// Libraries that belong to LWJGL
-	QSet<QString> lwjglWhitelist;
-	// Currently recommended minecraft version
-	QString recommendedMinecraftVersion;
-};
-extern VersionFilterData MULTIMC_LOGIC_EXPORT g_VersionFilterData;
diff --git a/libraries/logic/minecraft/World.cpp b/libraries/logic/minecraft/World.cpp
deleted file mode 100644
index 6081a8ec..00000000
--- a/libraries/logic/minecraft/World.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QDir>
-#include <QString>
-#include <QDebug>
-#include <QSaveFile>
-#include "World.h"
-
-#include "GZip.h"
-#include <MMCZip.h>
-#include <FileSystem.h>
-#include <sstream>
-#include <io/stream_reader.h>
-#include <tag_string.h>
-#include <tag_primitive.h>
-#include <quazip.h>
-#include <quazipfile.h>
-#include <quazipdir.h>
-
-std::unique_ptr <nbt::tag_compound> parseLevelDat(QByteArray data)
-{
-	QByteArray output;
-	if(!GZip::unzip(data, output))
-	{
-		return nullptr;
-	}
-	std::istringstream foo(std::string(output.constData(), output.size()));
-	auto pair = nbt::io::read_compound(foo);
-
-	if(pair.first != "")
-		return nullptr;
-
-	if(pair.second == nullptr)
-		return nullptr;
-
-	return std::move(pair.second);
-}
-
-QByteArray serializeLevelDat(nbt::tag_compound * levelInfo)
-{
-	std::ostringstream s;
-	nbt::io::write_tag("", *levelInfo, s);
-	QByteArray val( s.str().data(), (int) s.str().size() );
-	return val;
-}
-
-QString getLevelDatFromFS(const QFileInfo &file)
-{
-	QDir worldDir(file.filePath());
-	if(!file.isDir() || !worldDir.exists("level.dat"))
-	{
-		return QString();
-	}
-	return worldDir.absoluteFilePath("level.dat");
-}
-
-QByteArray getLevelDatDataFromFS(const QFileInfo &file)
-{
-	auto fullFilePath = getLevelDatFromFS(file);
-	if(fullFilePath.isNull())
-	{
-		return QByteArray();
-	}
-	QFile f(fullFilePath);
-	if(!f.open(QIODevice::ReadOnly))
-	{
-		return QByteArray();
-	}
-	return f.readAll();
-}
-
-bool putLevelDatDataToFS(const QFileInfo &file, QByteArray & data)
-{
-	auto fullFilePath =  getLevelDatFromFS(file);
-	if(fullFilePath.isNull())
-	{
-		return false;
-	}
-	QSaveFile f(fullFilePath);
-	if(!f.open(QIODevice::WriteOnly))
-	{
-		return false;
-	}
-	QByteArray compressed;
-	if(!GZip::zip(data, compressed))
-	{
-		return false;
-	}
-	if(f.write(compressed) != compressed.size())
-	{
-		f.cancelWriting();
-		return false;
-	}
-	return f.commit();
-}
-
-World::World(const QFileInfo &file)
-{
-	repath(file);
-}
-
-void World::repath(const QFileInfo &file)
-{
-	m_containerFile = file;
-	m_folderName = file.fileName();
-	if(file.isFile() && file.suffix() == "zip")
-	{
-		readFromZip(file);
-	}
-	else if(file.isDir())
-	{
-		readFromFS(file);
-	}
-}
-
-void World::readFromFS(const QFileInfo &file)
-{
-	auto bytes = getLevelDatDataFromFS(file);
-	if(bytes.isEmpty())
-	{
-		is_valid = false;
-		return;
-	}
-	loadFromLevelDat(bytes);
-	levelDatTime = file.lastModified();
-}
-
-void World::readFromZip(const QFileInfo &file)
-{
-	QuaZip zip(file.absoluteFilePath());
-	is_valid = zip.open(QuaZip::mdUnzip);
-	if (!is_valid)
-	{
-		return;
-	}
-	auto location = MMCZip::findFileInZip(&zip, "level.dat");
-	is_valid = !location.isEmpty();
-	if (!is_valid)
-	{
-		return;
-	}
-	m_containerOffsetPath = location;
-	QuaZipFile zippedFile(&zip);
-	// read the install profile
-	is_valid = zip.setCurrentFile(location + "level.dat");
-	if (!is_valid)
-	{
-		return;
-	}
-	is_valid = zippedFile.open(QIODevice::ReadOnly);
-	QuaZipFileInfo64 levelDatInfo;
-	zippedFile.getFileInfo(&levelDatInfo);
-	auto modTime = levelDatInfo.getNTFSmTime();
-	if(!modTime.isValid())
-	{
-		modTime = levelDatInfo.dateTime;
-	}
-	levelDatTime = modTime;
-	if (!is_valid)
-	{
-		return;
-	}
-	loadFromLevelDat(zippedFile.readAll());
-	zippedFile.close();
-}
-
-bool World::install(const QString &to, const QString &name)
-{
-	auto finalPath = FS::PathCombine(to, FS::DirNameFromString(m_actualName, to));
-	if(!FS::ensureFolderPathExists(finalPath))
-	{
-		return false;
-	}
-	bool ok = false;
-	if(m_containerFile.isFile())
-	{
-		QuaZip zip(m_containerFile.absoluteFilePath());
-		if (!zip.open(QuaZip::mdUnzip))
-		{
-			return false;
-		}
-		ok = !MMCZip::extractSubDir(&zip, m_containerOffsetPath, finalPath).isEmpty();
-	}
-	else if(m_containerFile.isDir())
-	{
-		QString from = m_containerFile.filePath();
-		ok = FS::copy(from, finalPath)();
-	}
-
-	if(ok && !name.isEmpty() && m_actualName != name)
-	{
-		World newWorld(finalPath);
-		if(newWorld.isValid())
-		{
-			newWorld.rename(name);
-		}
-	}
-	return ok;
-}
-
-bool World::rename(const QString &newName)
-{
-	if(m_containerFile.isFile())
-	{
-		return false;
-	}
-
-	auto data = getLevelDatDataFromFS(m_containerFile);
-	if(data.isEmpty())
-	{
-		return false;
-	}
-
-	auto worldData = parseLevelDat(data);
-	if(!worldData)
-	{
-		return false;
-	}
-	auto &val = worldData->at("Data");
-	if(val.get_type() != nbt::tag_type::Compound)
-	{
-		return false;
-	}
-	auto &dataCompound = val.as<nbt::tag_compound>();
-	dataCompound.put("LevelName", nbt::value_initializer(newName.toUtf8().data()));
-	data = serializeLevelDat(worldData.get());
-
-	putLevelDatDataToFS(m_containerFile, data);
-
-	m_actualName = newName;
-
-	QDir parentDir(m_containerFile.absoluteFilePath());
-	parentDir.cdUp();
-	QFile container(m_containerFile.absoluteFilePath());
-	auto dirName = FS::DirNameFromString(m_actualName, parentDir.absolutePath());
-	container.rename(parentDir.absoluteFilePath(dirName));
-
-	return true;
-}
-
-static QString read_string (nbt::value& parent, const char * name, const QString & fallback = QString())
-{
-	try
-	{
-		auto &namedValue = parent.at(name);
-		if(namedValue.get_type() != nbt::tag_type::String)
-		{
-			return fallback;
-		}
-		auto & tag_str = namedValue.as<nbt::tag_string>();
-		return QString::fromStdString(tag_str.get());
-	}
-	catch(std::out_of_range e)
-	{
-		// fallback for old world formats
-		qWarning() << "String NBT tag" << name << "could not be found. Defaulting to" << fallback;
-		return fallback;
-	}
-	catch(std::bad_cast e)
-	{
-		// type mismatch
-		qWarning() << "NBT tag" << name << "could not be converted to string. Defaulting to" << fallback;
-		return fallback;
-	}
-};
-
-static int64_t read_long (nbt::value& parent, const char * name, const int64_t & fallback = 0)
-{
-	try
-	{
-		auto &namedValue = parent.at(name);
-		if(namedValue.get_type() != nbt::tag_type::Long)
-		{
-			return fallback;
-		}
-		auto & tag_str = namedValue.as<nbt::tag_long>();
-		return tag_str.get();
-	}
-	catch(std::out_of_range e)
-	{
-		// fallback for old world formats
-		qWarning() << "Long NBT tag" << name << "could not be found. Defaulting to" << fallback;
-		return fallback;
-	}
-	catch(std::bad_cast e)
-	{
-		// type mismatch
-		qWarning() << "NBT tag" << name << "could not be converted to long. Defaulting to" << fallback;
-		return fallback;
-	}
-};
-
-void World::loadFromLevelDat(QByteArray data)
-{
-	try
-	{
-		auto levelData = parseLevelDat(data);
-		if(!levelData)
-		{
-			is_valid = false;
-			return;
-		}
-
-		auto &val = levelData->at("Data");
-		is_valid = val.get_type() == nbt::tag_type::Compound;
-		if(!is_valid)
-			return;
-
-		m_actualName = read_string(val, "LevelName", m_folderName);
-
-
-		int64_t temp = read_long(val, "LastPlayed", 0);
-		if(temp == 0)
-		{
-			m_lastPlayed = levelDatTime;
-		}
-		else
-		{
-			m_lastPlayed = QDateTime::fromMSecsSinceEpoch(temp);
-		}
-
-		m_randomSeed = read_long(val, "RandomSeed", 0);
-
-		qDebug() << "World Name:" << m_actualName;
-		qDebug() << "Last Played:" << m_lastPlayed.toString();
-		qDebug() << "Seed:" << m_randomSeed;
-	}
-	catch (nbt::io::input_error e)
-	{
-		qWarning() << "Unable to load" << m_folderName << ":" << e.what();
-		is_valid = false;
-		return;
-	}
-}
-
-bool World::replace(World &with)
-{
-	if (!destroy())
-		return false;
-	bool success = FS::copy(with.m_containerFile.filePath(), m_containerFile.path())();
-	if (success)
-	{
-		m_folderName = with.m_folderName;
-		m_containerFile.refresh();
-	}
-	return success;
-}
-
-bool World::destroy()
-{
-	if(!is_valid) return false;
-	if (m_containerFile.isDir())
-	{
-		QDir d(m_containerFile.filePath());
-		return d.removeRecursively();
-	}
-	else if(m_containerFile.isFile())
-	{
-		QFile file(m_containerFile.absoluteFilePath());
-		return file.remove();
-	}
-	return true;
-}
-
-bool World::operator==(const World &other) const
-{
-	return is_valid == other.is_valid && folderName() == other.folderName();
-}
-bool World::strongCompare(const World &other) const
-{
-	return is_valid == other.is_valid && folderName() == other.folderName();
-}
diff --git a/libraries/logic/minecraft/World.h b/libraries/logic/minecraft/World.h
deleted file mode 100644
index 3cde5ea4..00000000
--- a/libraries/logic/minecraft/World.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QFileInfo>
-#include <QDateTime>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT World
-{
-public:
-	World(const QFileInfo &file);
-	QString folderName() const
-	{
-		return m_folderName;
-	}
-	QString name() const
-	{
-		return m_actualName;
-	}
-	QDateTime lastPlayed() const
-	{
-		return m_lastPlayed;
-	}
-	int64_t seed() const
-	{
-		return m_randomSeed;
-	}
-	bool isValid() const
-	{
-		return is_valid;
-	}
-	bool isOnFS() const
-	{
-		return m_containerFile.isDir();
-	}
-	QFileInfo container() const
-	{
-		return m_containerFile;
-	}
-	// delete all the files of this world
-	bool destroy();
-	// replace this world with a copy of the other
-	bool replace(World &with);
-	// change the world's filesystem path (used by world lists for *MAGIC* purposes)
-	void repath(const QFileInfo &file);
-
-	bool rename(const QString &to);
-	bool install(const QString &to, const QString &name= QString());
-
-	// WEAK compare operator - used for replacing worlds
-	bool operator==(const World &other) const;
-	bool strongCompare(const World &other) const;
-
-private:
-	void readFromZip(const QFileInfo &file);
-	void readFromFS(const QFileInfo &file);
-	void loadFromLevelDat(QByteArray data);
-
-protected:
-
-	QFileInfo m_containerFile;
-	QString m_containerOffsetPath;
-	QString m_folderName;
-	QString m_actualName;
-	QDateTime levelDatTime;
-	QDateTime m_lastPlayed;
-	int64_t m_randomSeed = 0;
-	bool is_valid = false;
-};
diff --git a/libraries/logic/minecraft/WorldList.cpp b/libraries/logic/minecraft/WorldList.cpp
deleted file mode 100644
index 42c8a3e6..00000000
--- a/libraries/logic/minecraft/WorldList.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WorldList.h"
-#include <FileSystem.h>
-#include <QMimeData>
-#include <QUrl>
-#include <QUuid>
-#include <QString>
-#include <QFileSystemWatcher>
-#include <QDebug>
-
-WorldList::WorldList(const QString &dir)
-	: QAbstractListModel(), m_dir(dir)
-{
-	FS::ensureFolderPathExists(m_dir.absolutePath());
-	m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs |
-					QDir::NoSymLinks);
-	m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
-	m_watcher = new QFileSystemWatcher(this);
-	is_watching = false;
-	connect(m_watcher, SIGNAL(directoryChanged(QString)), this,
-			SLOT(directoryChanged(QString)));
-}
-
-void WorldList::startWatching()
-{
-	update();
-	is_watching = m_watcher->addPath(m_dir.absolutePath());
-	if (is_watching)
-	{
-		qDebug() << "Started watching " << m_dir.absolutePath();
-	}
-	else
-	{
-		qDebug() << "Failed to start watching " << m_dir.absolutePath();
-	}
-}
-
-void WorldList::stopWatching()
-{
-	is_watching = !m_watcher->removePath(m_dir.absolutePath());
-	if (!is_watching)
-	{
-		qDebug() << "Stopped watching " << m_dir.absolutePath();
-	}
-	else
-	{
-		qDebug() << "Failed to stop watching " << m_dir.absolutePath();
-	}
-}
-
-bool WorldList::update()
-{
-	if (!isValid())
-		return false;
-
-	QList<World> newWorlds;
-	m_dir.refresh();
-	auto folderContents = m_dir.entryInfoList();
-	// if there are any untracked files...
-	for (QFileInfo entry : folderContents)
-	{
-		if(!entry.isDir())
-			continue;
-
-		World w(entry);
-		if(w.isValid())
-		{
-			newWorlds.append(w);
-		}
-	}
-	beginResetModel();
-	worlds.swap(newWorlds);
-	endResetModel();
-	return true;
-}
-
-void WorldList::directoryChanged(QString path)
-{
-	update();
-}
-
-bool WorldList::isValid()
-{
-	return m_dir.exists() && m_dir.isReadable();
-}
-
-bool WorldList::deleteWorld(int index)
-{
-	if (index >= worlds.size() || index < 0)
-		return false;
-	World &m = worlds[index];
-	if (m.destroy())
-	{
-		beginRemoveRows(QModelIndex(), index, index);
-		worlds.removeAt(index);
-		endRemoveRows();
-		emit changed();
-		return true;
-	}
-	return false;
-}
-
-bool WorldList::deleteWorlds(int first, int last)
-{
-	for (int i = first; i <= last; i++)
-	{
-		World &m = worlds[i];
-		m.destroy();
-	}
-	beginRemoveRows(QModelIndex(), first, last);
-	worlds.erase(worlds.begin() + first, worlds.begin() + last + 1);
-	endRemoveRows();
-	emit changed();
-	return true;
-}
-
-int WorldList::columnCount(const QModelIndex &parent) const
-{
-	return 2;
-}
-
-QVariant WorldList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	int row = index.row();
-	int column = index.column();
-
-	if (row < 0 || row >= worlds.size())
-		return QVariant();
-
-	auto & world = worlds[row];
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (column)
-		{
-		case NameColumn:
-			return world.name();
-
-		case LastPlayedColumn:
-			return world.lastPlayed();
-
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-	{
-		return world.folderName();
-	}
-	case ObjectRole:
-	{
-		return QVariant::fromValue<void *>((void *)&world);
-	}
-	case FolderRole:
-	{
-		return QDir::toNativeSeparators(dir().absoluteFilePath(world.folderName()));
-	}
-	case SeedRole:
-	{
-		return qVariantFromValue<qlonglong>(world.seed());
-	}
-	case NameRole:
-	{
-		return world.name();
-	}
-	case LastPlayedRole:
-	{
-		return world.lastPlayed();
-	}
-	default:
-		return QVariant();
-	}
-}
-
-QVariant WorldList::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (section)
-		{
-		case NameColumn:
-			return tr("Name");
-		case LastPlayedColumn:
-			return tr("Last Played");
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-		switch (section)
-		{
-		case NameColumn:
-			return tr("The name of the world.");
-		case LastPlayedColumn:
-			return tr("Date and time the world was last played.");
-		default:
-			return QVariant();
-		}
-	default:
-		return QVariant();
-	}
-	return QVariant();
-}
-
-QStringList WorldList::mimeTypes() const
-{
-	QStringList types;
-	types << "text/uri-list";
-	return types;
-}
-
-class WorldMimeData : public QMimeData
-{
-Q_OBJECT
-
-public:
-	WorldMimeData(QList<World> worlds)
-	{
-		m_worlds = worlds;
-
-	}
-	QStringList formats() const
-	{
-		return QMimeData::formats() << "text/uri-list";
-	}
-
-protected:
-	QVariant retrieveData(const QString &mimetype, QVariant::Type type) const
-	{
-		QList<QUrl> urls;
-		for(auto &world: m_worlds)
-		{
-			if(!world.isValid() || !world.isOnFS())
-				continue;
-			QString worldPath = world.container().absoluteFilePath();
-			qDebug() << worldPath;
-			urls.append(QUrl::fromLocalFile(worldPath));
-		}
-		const_cast<WorldMimeData*>(this)->setUrls(urls);
-		return QMimeData::retrieveData(mimetype, type);
-	}
-private:
-	QList<World> m_worlds;
-};
-
-QMimeData *WorldList::mimeData(const QModelIndexList &indexes) const
-{
-	if (indexes.size() == 0)
-		return new QMimeData();
-
-	QList<World> worlds;
-	for(auto idx : indexes)
-	{
-		if(idx.column() != 0)
-			continue;
-		int row = idx.row();
-		if (row < 0 || row >= this->worlds.size())
-			continue;
-		worlds.append(this->worlds[row]);
-	}
-	if(!worlds.size())
-	{
-		return new QMimeData();
-	}
-	return new WorldMimeData(worlds);
-}
-
-Qt::ItemFlags WorldList::flags(const QModelIndex &index) const
-{
-	Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
-	if (index.isValid())
-		return Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled |
-			   defaultFlags;
-	else
-		return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-Qt::DropActions WorldList::supportedDragActions() const
-{
-	// move to other mod lists or VOID
-	return Qt::MoveAction;
-}
-
-Qt::DropActions WorldList::supportedDropActions() const
-{
-	// copy from outside, move from within and other mod lists
-	return Qt::CopyAction | Qt::MoveAction;
-}
-
-void WorldList::installWorld(QFileInfo filename)
-{
-	qDebug() << "installing: " << filename.absoluteFilePath();
-	World w(filename);
-	if(!w.isValid())
-	{
-		return;
-	}
-	w.install(m_dir.absolutePath());
-}
-
-bool WorldList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
-							 const QModelIndex &parent)
-{
-	if (action == Qt::IgnoreAction)
-		return true;
-	// check if the action is supported
-	if (!data || !(action & supportedDropActions()))
-		return false;
-	// files dropped from outside?
-	if (data->hasUrls())
-	{
-		bool was_watching = is_watching;
-		if (was_watching)
-			stopWatching();
-		auto urls = data->urls();
-		for (auto url : urls)
-		{
-			// only local files may be dropped...
-			if (!url.isLocalFile())
-				continue;
-			QString filename = url.toLocalFile();
-
-			QFileInfo worldInfo(filename);
-
-			if(!m_dir.entryInfoList().contains(worldInfo))
-			{
-				installWorld(worldInfo);
-			}
-		}
-		if (was_watching)
-			startWatching();
-		return true;
-	}
-	return false;
-}
-
-#include "WorldList.moc"
diff --git a/libraries/logic/minecraft/WorldList.h b/libraries/logic/minecraft/WorldList.h
deleted file mode 100644
index 34b30e9c..00000000
--- a/libraries/logic/minecraft/WorldList.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QList>
-#include <QString>
-#include <QDir>
-#include <QAbstractListModel>
-#include <QMimeData>
-#include "minecraft/World.h"
-
-#include "multimc_logic_export.h"
-
-class QFileSystemWatcher;
-
-class MULTIMC_LOGIC_EXPORT WorldList : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	enum Columns
-	{
-		NameColumn,
-		LastPlayedColumn
-	};
-
-	enum Roles
-	{
-		ObjectRole = Qt::UserRole + 1,
-		FolderRole,
-		SeedRole,
-		NameRole,
-		LastPlayedRole
-	};
-
-	WorldList(const QString &dir);
-
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const
-	{
-		return size();
-	};
-	virtual QVariant headerData(int section, Qt::Orientation orientation,
-								int role = Qt::DisplayRole) const;
-	virtual int columnCount(const QModelIndex &parent) const;
-
-	size_t size() const
-	{
-		return worlds.size();
-	};
-	bool empty() const
-	{
-		return size() == 0;
-	}
-	World &operator[](size_t index)
-	{
-		return worlds[index];
-	}
-
-	/// Reloads the mod list and returns true if the list changed.
-	virtual bool update();
-
-	/// Install a world from location
-	void installWorld(QFileInfo filename);
-
-	/// Deletes the mod at the given index.
-	virtual bool deleteWorld(int index);
-
-	/// Deletes all the selected mods
-	virtual bool deleteWorlds(int first, int last);
-
-	/// flags, mostly to support drag&drop
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-	/// get data for drag action
-	virtual QMimeData *mimeData(const QModelIndexList &indexes) const;
-	/// get the supported mime types
-	virtual QStringList mimeTypes() const;
-	/// process data from drop action
-	virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-	/// what drag actions do we support?
-	virtual Qt::DropActions supportedDragActions() const;
-
-	/// what drop actions do we support?
-	virtual Qt::DropActions supportedDropActions() const;
-
-	void startWatching();
-	void stopWatching();
-
-	virtual bool isValid();
-
-	QDir dir() const
-	{
-		return m_dir;
-	}
-
-	const QList<World> &allWorlds() const
-	{
-		return worlds;
-	}
-
-private slots:
-	void directoryChanged(QString path);
-
-signals:
-	void changed();
-
-protected:
-	QFileSystemWatcher *m_watcher;
-	bool is_watching;
-	QDir m_dir;
-	QList<World> worlds;
-};
diff --git a/libraries/logic/minecraft/auth/AuthSession.cpp b/libraries/logic/minecraft/auth/AuthSession.cpp
deleted file mode 100644
index 8758bfbd..00000000
--- a/libraries/logic/minecraft/auth/AuthSession.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "AuthSession.h"
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QStringList>
-
-QString AuthSession::serializeUserProperties()
-{
-	QJsonObject userAttrs;
-	for (auto key : u.properties.keys())
-	{
-		auto array = QJsonArray::fromStringList(u.properties.values(key));
-		userAttrs.insert(key, array);
-	}
-	QJsonDocument value(userAttrs);
-	return value.toJson(QJsonDocument::Compact);
-
-}
-
-bool AuthSession::MakeOffline(QString offline_playername)
-{
-	if (status != PlayableOffline && status != PlayableOnline)
-	{
-		return false;
-	}
-	session = "-";
-	player_name = offline_playername;
-	status = PlayableOffline;
-	return true;
-}
diff --git a/libraries/logic/minecraft/auth/AuthSession.h b/libraries/logic/minecraft/auth/AuthSession.h
deleted file mode 100644
index dede90a9..00000000
--- a/libraries/logic/minecraft/auth/AuthSession.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QMultiMap>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-struct User
-{
-	QString id;
-	QMultiMap<QString, QString> properties;
-};
-
-struct MULTIMC_LOGIC_EXPORT AuthSession
-{
-	bool MakeOffline(QString offline_playername);
-
-	QString serializeUserProperties();
-
-	enum Status
-	{
-		Undetermined,
-		RequiresPassword,
-		PlayableOffline,
-		PlayableOnline
-	} status = Undetermined;
-
-	User u;
-
-	// client token
-	QString client_token;
-	// account user name
-	QString username;
-	// combined session ID
-	QString session;
-	// volatile auth token
-	QString access_token;
-	// profile name
-	QString player_name;
-	// profile ID
-	QString uuid;
-	// 'legacy' or 'mojang', depending on account type
-	QString user_type;
-	// Did the auth server reply?
-	bool auth_server_online = false;
-	// Did the user request online mode?
-	bool wants_online = true;
-};
-
-typedef std::shared_ptr<AuthSession> AuthSessionPtr;
diff --git a/libraries/logic/minecraft/auth/MojangAccount.cpp b/libraries/logic/minecraft/auth/MojangAccount.cpp
deleted file mode 100644
index 69a24c09..00000000
--- a/libraries/logic/minecraft/auth/MojangAccount.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MojangAccount.h"
-#include "flows/RefreshTask.h"
-#include "flows/AuthenticateTask.h"
-
-#include <QUuid>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QRegExp>
-#include <QStringList>
-#include <QJsonDocument>
-
-#include <QDebug>
-
-MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject &object)
-{
-	// The JSON object must at least have a username for it to be valid.
-	if (!object.value("username").isString())
-	{
-		qCritical() << "Can't load Mojang account info from JSON object. Username field is "
-						"missing or of the wrong type.";
-		return nullptr;
-	}
-
-	QString username = object.value("username").toString("");
-	QString clientToken = object.value("clientToken").toString("");
-	QString accessToken = object.value("accessToken").toString("");
-
-	QJsonArray profileArray = object.value("profiles").toArray();
-	if (profileArray.size() < 1)
-	{
-		qCritical() << "Can't load Mojang account with username \"" << username
-					 << "\". No profiles found.";
-		return nullptr;
-	}
-
-	QList<AccountProfile> profiles;
-	for (QJsonValue profileVal : profileArray)
-	{
-		QJsonObject profileObject = profileVal.toObject();
-		QString id = profileObject.value("id").toString("");
-		QString name = profileObject.value("name").toString("");
-		bool legacy = profileObject.value("legacy").toBool(false);
-		if (id.isEmpty() || name.isEmpty())
-		{
-			qWarning() << "Unable to load a profile because it was missing an ID or a name.";
-			continue;
-		}
-		profiles.append({id, name, legacy});
-	}
-
-	MojangAccountPtr account(new MojangAccount());
-	if (object.value("user").isObject())
-	{
-		User u;
-		QJsonObject userStructure = object.value("user").toObject();
-		u.id = userStructure.value("id").toString();
-		/*
-		QJsonObject propMap = userStructure.value("properties").toObject();
-		for(auto key: propMap.keys())
-		{
-			auto values = propMap.operator[](key).toArray();
-			for(auto value: values)
-				u.properties.insert(key, value.toString());
-		}
-		*/
-		account->m_user = u;
-	}
-	account->m_username = username;
-	account->m_clientToken = clientToken;
-	account->m_accessToken = accessToken;
-	account->m_profiles = profiles;
-
-	// Get the currently selected profile.
-	QString currentProfile = object.value("activeProfile").toString("");
-	if (!currentProfile.isEmpty())
-		account->setCurrentProfile(currentProfile);
-
-	return account;
-}
-
-MojangAccountPtr MojangAccount::createFromUsername(const QString &username)
-{
-	MojangAccountPtr account(new MojangAccount());
-	account->m_clientToken = QUuid::createUuid().toString().remove(QRegExp("[{}-]"));
-	account->m_username = username;
-	return account;
-}
-
-QJsonObject MojangAccount::saveToJson() const
-{
-	QJsonObject json;
-	json.insert("username", m_username);
-	json.insert("clientToken", m_clientToken);
-	json.insert("accessToken", m_accessToken);
-
-	QJsonArray profileArray;
-	for (AccountProfile profile : m_profiles)
-	{
-		QJsonObject profileObj;
-		profileObj.insert("id", profile.id);
-		profileObj.insert("name", profile.name);
-		profileObj.insert("legacy", profile.legacy);
-		profileArray.append(profileObj);
-	}
-	json.insert("profiles", profileArray);
-
-	QJsonObject userStructure;
-	{
-		userStructure.insert("id", m_user.id);
-		/*
-		QJsonObject userAttrs;
-		for(auto key: m_user.properties.keys())
-		{
-			auto array = QJsonArray::fromStringList(m_user.properties.values(key));
-			userAttrs.insert(key, array);
-		}
-		userStructure.insert("properties", userAttrs);
-		*/
-	}
-	json.insert("user", userStructure);
-
-	if (m_currentProfile != -1)
-		json.insert("activeProfile", currentProfile()->id);
-
-	return json;
-}
-
-bool MojangAccount::setCurrentProfile(const QString &profileId)
-{
-	for (int i = 0; i < m_profiles.length(); i++)
-	{
-		if (m_profiles[i].id == profileId)
-		{
-			m_currentProfile = i;
-			return true;
-		}
-	}
-	return false;
-}
-
-const AccountProfile *MojangAccount::currentProfile() const
-{
-	if (m_currentProfile == -1)
-		return nullptr;
-	return &m_profiles[m_currentProfile];
-}
-
-AccountStatus MojangAccount::accountStatus() const
-{
-	if (m_accessToken.isEmpty())
-		return NotVerified;
-	else
-		return Verified;
-}
-
-std::shared_ptr<YggdrasilTask> MojangAccount::login(AuthSessionPtr session,
-													QString password)
-{
-	Q_ASSERT(m_currentTask.get() == nullptr);
-
-	// take care of the true offline status
-	if (accountStatus() == NotVerified && password.isEmpty())
-	{
-		if (session)
-		{
-			session->status = AuthSession::RequiresPassword;
-			fillSession(session);
-		}
-		return nullptr;
-	}
-
-	if (password.isEmpty())
-	{
-		m_currentTask.reset(new RefreshTask(this));
-	}
-	else
-	{
-		m_currentTask.reset(new AuthenticateTask(this, password));
-	}
-	m_currentTask->assignSession(session);
-
-	connect(m_currentTask.get(), SIGNAL(succeeded()), SLOT(authSucceeded()));
-	connect(m_currentTask.get(), SIGNAL(failed(QString)), SLOT(authFailed(QString)));
-	return m_currentTask;
-}
-
-void MojangAccount::authSucceeded()
-{
-	auto session = m_currentTask->getAssignedSession();
-	if (session)
-	{
-		session->status =
-			session->wants_online ? AuthSession::PlayableOnline : AuthSession::PlayableOffline;
-		fillSession(session);
-		session->auth_server_online = true;
-	}
-	m_currentTask.reset();
-	emit changed();
-}
-
-void MojangAccount::authFailed(QString reason)
-{
-	auto session = m_currentTask->getAssignedSession();
-	// This is emitted when the yggdrasil tasks time out or are cancelled.
-	// -> we treat the error as no-op
-	if (m_currentTask->state() == YggdrasilTask::STATE_FAILED_SOFT)
-	{
-		if (session)
-		{
-			session->status = accountStatus() == Verified ? AuthSession::PlayableOffline
-														  : AuthSession::RequiresPassword;
-			session->auth_server_online = false;
-			fillSession(session);
-		}
-	}
-	else
-	{
-		m_accessToken = QString();
-		emit changed();
-		if (session)
-		{
-			session->status = AuthSession::RequiresPassword;
-			session->auth_server_online = true;
-			fillSession(session);
-		}
-	}
-	m_currentTask.reset();
-}
-
-void MojangAccount::fillSession(AuthSessionPtr session)
-{
-	// the user name. you have to have an user name
-	session->username = m_username;
-	// volatile auth token
-	session->access_token = m_accessToken;
-	// the semi-permanent client token
-	session->client_token = m_clientToken;
-	if (currentProfile())
-	{
-		// profile name
-		session->player_name = currentProfile()->name;
-		// profile ID
-		session->uuid = currentProfile()->id;
-		// 'legacy' or 'mojang', depending on account type
-		session->user_type = currentProfile()->legacy ? "legacy" : "mojang";
-		if (!session->access_token.isEmpty())
-		{
-			session->session = "token:" + m_accessToken + ":" + m_profiles[m_currentProfile].id;
-		}
-		else
-		{
-			session->session = "-";
-		}
-	}
-	else
-	{
-		session->player_name = "Player";
-		session->session = "-";
-	}
-	session->u = user();
-}
diff --git a/libraries/logic/minecraft/auth/MojangAccount.h b/libraries/logic/minecraft/auth/MojangAccount.h
deleted file mode 100644
index 2de0c19c..00000000
--- a/libraries/logic/minecraft/auth/MojangAccount.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-#include <QJsonObject>
-#include <QPair>
-#include <QMap>
-
-#include <memory>
-#include "AuthSession.h"
-
-#include "multimc_logic_export.h"
-
-class Task;
-class YggdrasilTask;
-class MojangAccount;
-
-typedef std::shared_ptr<MojangAccount> MojangAccountPtr;
-Q_DECLARE_METATYPE(MojangAccountPtr)
-
-/**
- * A profile within someone's Mojang account.
- *
- * Currently, the profile system has not been implemented by Mojang yet,
- * but we might as well add some things for it in MultiMC right now so
- * we don't have to rip the code to pieces to add it later.
- */
-struct AccountProfile
-{
-	QString id;
-	QString name;
-	bool legacy;
-};
-
-enum AccountStatus
-{
-	NotVerified,
-	Verified
-};
-
-/**
- * Object that stores information about a certain Mojang account.
- *
- * Said information may include things such as that account's username, client token, and access
- * token if the user chose to stay logged in.
- */
-class MULTIMC_LOGIC_EXPORT MojangAccount : public QObject
-{
-	Q_OBJECT
-public: /* construction */
-	//! Do not copy accounts. ever.
-	explicit MojangAccount(const MojangAccount &other, QObject *parent) = delete;
-
-	//! Default constructor
-	explicit MojangAccount(QObject *parent = 0) : QObject(parent) {};
-
-	//! Creates an empty account for the specified user name.
-	static MojangAccountPtr createFromUsername(const QString &username);
-
-	//! Loads a MojangAccount from the given JSON object.
-	static MojangAccountPtr loadFromJson(const QJsonObject &json);
-
-	//! Saves a MojangAccount to a JSON object and returns it.
-	QJsonObject saveToJson() const;
-
-public: /* manipulation */
-		/**
-	 * Sets the currently selected profile to the profile with the given ID string.
-	 * If profileId is not in the list of available profiles, the function will simply return
-	 * false.
-	 */
-	bool setCurrentProfile(const QString &profileId);
-
-	/**
-	 * Attempt to login. Empty password means we use the token.
-	 * If the attempt fails because we already are performing some task, it returns false.
-	 */
-	std::shared_ptr<YggdrasilTask> login(AuthSessionPtr session,
-										 QString password = QString());
-
-public: /* queries */
-	const QString &username() const
-	{
-		return m_username;
-	}
-
-	const QString &clientToken() const
-	{
-		return m_clientToken;
-	}
-
-	const QString &accessToken() const
-	{
-		return m_accessToken;
-	}
-
-	const QList<AccountProfile> &profiles() const
-	{
-		return m_profiles;
-	}
-
-	const User &user()
-	{
-		return m_user;
-	}
-
-	//! Returns the currently selected profile (if none, returns nullptr)
-	const AccountProfile *currentProfile() const;
-
-	//! Returns whether the account is NotVerified, Verified or Online
-	AccountStatus accountStatus() const;
-
-signals:
-	/**
-	 * This signal is emitted when the account changes
-	 */
-	void changed();
-
-	// TODO: better signalling for the various possible state changes - especially errors
-
-protected: /* variables */
-	QString m_username;
-
-	// Used to identify the client - the user can have multiple clients for the same account
-	// Think: different launchers, all connecting to the same account/profile
-	QString m_clientToken;
-
-	// Blank if not logged in.
-	QString m_accessToken;
-
-	// Index of the selected profile within the list of available
-	// profiles. -1 if nothing is selected.
-	int m_currentProfile = -1;
-
-	// List of available profiles.
-	QList<AccountProfile> m_profiles;
-
-	// the user structure, whatever it is.
-	User m_user;
-
-	// current task we are executing here
-	std::shared_ptr<YggdrasilTask> m_currentTask;
-
-private
-slots:
-	void authSucceeded();
-	void authFailed(QString reason);
-
-private:
-	void fillSession(AuthSessionPtr session);
-
-public:
-	friend class YggdrasilTask;
-	friend class AuthenticateTask;
-	friend class ValidateTask;
-	friend class RefreshTask;
-};
diff --git a/libraries/logic/minecraft/auth/MojangAccountList.cpp b/libraries/logic/minecraft/auth/MojangAccountList.cpp
deleted file mode 100644
index 26cbc81a..00000000
--- a/libraries/logic/minecraft/auth/MojangAccountList.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MojangAccountList.h"
-#include "MojangAccount.h"
-
-#include <QIODevice>
-#include <QFile>
-#include <QTextStream>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonParseError>
-#include <QDir>
-
-#include <QDebug>
-
-#include <FileSystem.h>
-
-#define ACCOUNT_LIST_FORMAT_VERSION 2
-
-MojangAccountList::MojangAccountList(QObject *parent) : QAbstractListModel(parent)
-{
-}
-
-MojangAccountPtr MojangAccountList::findAccount(const QString &username) const
-{
-	for (int i = 0; i < count(); i++)
-	{
-		MojangAccountPtr account = at(i);
-		if (account->username() == username)
-			return account;
-	}
-	return nullptr;
-}
-
-const MojangAccountPtr MojangAccountList::at(int i) const
-{
-	return MojangAccountPtr(m_accounts.at(i));
-}
-
-void MojangAccountList::addAccount(const MojangAccountPtr account)
-{
-	beginResetModel();
-	connect(account.get(), SIGNAL(changed()), SLOT(accountChanged()));
-	m_accounts.append(account);
-	endResetModel();
-	onListChanged();
-}
-
-void MojangAccountList::removeAccount(const QString &username)
-{
-	beginResetModel();
-	for (auto account : m_accounts)
-	{
-		if (account->username() == username)
-		{
-			m_accounts.removeOne(account);
-			return;
-		}
-	}
-	endResetModel();
-	onListChanged();
-}
-
-void MojangAccountList::removeAccount(QModelIndex index)
-{
-	beginResetModel();
-	m_accounts.removeAt(index.row());
-	endResetModel();
-	onListChanged();
-}
-
-MojangAccountPtr MojangAccountList::activeAccount() const
-{
-	return m_activeAccount;
-}
-
-void MojangAccountList::setActiveAccount(const QString &username)
-{
-	beginResetModel();
-	if (username.isEmpty())
-	{
-		m_activeAccount = nullptr;
-	}
-	else
-	{
-		for (MojangAccountPtr account : m_accounts)
-		{
-			if (account->username() == username)
-				m_activeAccount = account;
-		}
-	}
-	endResetModel();
-	onActiveChanged();
-}
-
-void MojangAccountList::accountChanged()
-{
-	// the list changed. there is no doubt.
-	onListChanged();
-}
-
-void MojangAccountList::onListChanged()
-{
-	if (m_autosave)
-		// TODO: Alert the user if this fails.
-		saveList();
-
-	emit listChanged();
-}
-
-void MojangAccountList::onActiveChanged()
-{
-	if (m_autosave)
-		saveList();
-
-	emit activeAccountChanged();
-}
-
-int MojangAccountList::count() const
-{
-	return m_accounts.count();
-}
-
-QVariant MojangAccountList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	MojangAccountPtr account = at(index.row());
-
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (index.column())
-		{
-		case NameColumn:
-			return account->username();
-
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-		return account->username();
-
-	case PointerRole:
-		return qVariantFromValue(account);
-
-	case Qt::CheckStateRole:
-		switch (index.column())
-		{
-		case ActiveColumn:
-			return account == m_activeAccount;
-		}
-
-	default:
-		return QVariant();
-	}
-}
-
-QVariant MojangAccountList::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (section)
-		{
-		case ActiveColumn:
-			return tr("Active?");
-
-		case NameColumn:
-			return tr("Name");
-
-		default:
-			return QVariant();
-		}
-
-	case Qt::ToolTipRole:
-		switch (section)
-		{
-		case NameColumn:
-			return tr("The name of the version.");
-
-		default:
-			return QVariant();
-		}
-
-	default:
-		return QVariant();
-	}
-}
-
-int MojangAccountList::rowCount(const QModelIndex &parent) const
-{
-	// Return count
-	return count();
-}
-
-int MojangAccountList::columnCount(const QModelIndex &parent) const
-{
-	return 2;
-}
-
-Qt::ItemFlags MojangAccountList::flags(const QModelIndex &index) const
-{
-	if (index.row() < 0 || index.row() >= rowCount(index) || !index.isValid())
-	{
-		return Qt::NoItemFlags;
-	}
-
-	return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-}
-
-bool MojangAccountList::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-	if (index.row() < 0 || index.row() >= rowCount(index) || !index.isValid())
-	{
-		return false;
-	}
-
-	if(role == Qt::CheckStateRole)
-	{
-		if(value == Qt::Checked)
-		{
-			MojangAccountPtr account = this->at(index.row());
-			this->setActiveAccount(account->username());
-		}
-	}
-
-	emit dataChanged(index, index);
-	return true;
-}
-
-void MojangAccountList::updateListData(QList<MojangAccountPtr> versions)
-{
-	beginResetModel();
-	m_accounts = versions;
-	endResetModel();
-}
-
-bool MojangAccountList::loadList(const QString &filePath)
-{
-	QString path = filePath;
-	if (path.isEmpty())
-		path = m_listFilePath;
-	if (path.isEmpty())
-	{
-		qCritical() << "Can't load Mojang account list. No file path given and no default set.";
-		return false;
-	}
-
-	QFile file(path);
-
-	// Try to open the file and fail if we can't.
-	// TODO: We should probably report this error to the user.
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		qCritical() << QString("Failed to read the account list file (%1).").arg(path).toUtf8();
-		return false;
-	}
-
-	// Read the file and close it.
-	QByteArray jsonData = file.readAll();
-	file.close();
-
-	QJsonParseError parseError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parseError);
-
-	// Fail if the JSON is invalid.
-	if (parseError.error != QJsonParseError::NoError)
-	{
-		qCritical() << QString("Failed to parse account list file: %1 at offset %2")
-							.arg(parseError.errorString(), QString::number(parseError.offset))
-							.toUtf8();
-		return false;
-	}
-
-	// Make sure the root is an object.
-	if (!jsonDoc.isObject())
-	{
-		qCritical() << "Invalid account list JSON: Root should be an array.";
-		return false;
-	}
-
-	QJsonObject root = jsonDoc.object();
-
-	// Make sure the format version matches.
-	if (root.value("formatVersion").toVariant().toInt() != ACCOUNT_LIST_FORMAT_VERSION)
-	{
-		QString newName = "accounts-old.json";
-		qWarning() << "Format version mismatch when loading account list. Existing one will be renamed to"
-					<< newName;
-
-		// Attempt to rename the old version.
-		file.rename(newName);
-		return false;
-	}
-
-	// Now, load the accounts array.
-	beginResetModel();
-	QJsonArray accounts = root.value("accounts").toArray();
-	for (QJsonValue accountVal : accounts)
-	{
-		QJsonObject accountObj = accountVal.toObject();
-		MojangAccountPtr account = MojangAccount::loadFromJson(accountObj);
-		if (account.get() != nullptr)
-		{
-			connect(account.get(), SIGNAL(changed()), SLOT(accountChanged()));
-			m_accounts.append(account);
-		}
-		else
-		{
-			qWarning() << "Failed to load an account.";
-		}
-	}
-	// Load the active account.
-	m_activeAccount = findAccount(root.value("activeAccount").toString(""));
-	endResetModel();
-	return true;
-}
-
-bool MojangAccountList::saveList(const QString &filePath)
-{
-	QString path(filePath);
-	if (path.isEmpty())
-		path = m_listFilePath;
-	if (path.isEmpty())
-	{
-		qCritical() << "Can't save Mojang account list. No file path given and no default set.";
-		return false;
-	}
-
-	// make sure the parent folder exists
-	if(!FS::ensureFilePathExists(path))
-		return false;
-
-	// make sure the file wasn't overwritten with a folder before (fixes a bug)
-	QFileInfo finfo(path);
-	if(finfo.isDir())
-	{
-		QDir badDir(path);
-		badDir.removeRecursively();
-	}
-
-	qDebug() << "Writing account list to" << path;
-
-	qDebug() << "Building JSON data structure.";
-	// Build the JSON document to write to the list file.
-	QJsonObject root;
-
-	root.insert("formatVersion", ACCOUNT_LIST_FORMAT_VERSION);
-
-	// Build a list of accounts.
-	qDebug() << "Building account array.";
-	QJsonArray accounts;
-	for (MojangAccountPtr account : m_accounts)
-	{
-		QJsonObject accountObj = account->saveToJson();
-		accounts.append(accountObj);
-	}
-
-	// Insert the account list into the root object.
-	root.insert("accounts", accounts);
-
-	if(m_activeAccount)
-	{
-		// Save the active account.
-		root.insert("activeAccount", m_activeAccount->username());
-	}
-
-	// Create a JSON document object to convert our JSON to bytes.
-	QJsonDocument doc(root);
-
-	// Now that we're done building the JSON object, we can write it to the file.
-	qDebug() << "Writing account list to file.";
-	QFile file(path);
-
-	// Try to open the file and fail if we can't.
-	// TODO: We should probably report this error to the user.
-	if (!file.open(QIODevice::WriteOnly))
-	{
-		qCritical() << QString("Failed to read the account list file (%1).").arg(path).toUtf8();
-		return false;
-	}
-
-	// Write the JSON to the file.
-	file.write(doc.toJson());
-	file.setPermissions(QFile::ReadOwner|QFile::WriteOwner|QFile::ReadUser|QFile::WriteUser);
-	file.close();
-
-	qDebug() << "Saved account list to" << path;
-
-	return true;
-}
-
-void MojangAccountList::setListFilePath(QString path, bool autosave)
-{
-	m_listFilePath = path;
-	m_autosave = autosave;
-}
-
-bool MojangAccountList::anyAccountIsValid()
-{
-	for(auto account:m_accounts)
-	{
-		if(account->accountStatus() != NotVerified)
-			return true;
-	}
-	return false;
-}
diff --git a/libraries/logic/minecraft/auth/MojangAccountList.h b/libraries/logic/minecraft/auth/MojangAccountList.h
deleted file mode 100644
index c40fa6a3..00000000
--- a/libraries/logic/minecraft/auth/MojangAccountList.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "MojangAccount.h"
-
-#include <QObject>
-#include <QVariant>
-#include <QAbstractListModel>
-#include <QSharedPointer>
-
-#include "multimc_logic_export.h"
-
-/*!
- * \brief List of available Mojang accounts.
- * This should be loaded in the background by MultiMC on startup.
- *
- * This class also inherits from QAbstractListModel. Methods from that
- * class determine how this list shows up in a list view. Said methods
- * all have a default implementation, but they can be overridden by subclasses to
- * change the behavior of the list.
- */
-class MULTIMC_LOGIC_EXPORT MojangAccountList : public QAbstractListModel
-{
-	Q_OBJECT
-public:
-	enum ModelRoles
-	{
-		PointerRole = 0x34B1CB48
-	};
-
-	enum VListColumns
-	{
-		// TODO: Add icon column.
-
-		// First column - Active?
-		ActiveColumn = 0,
-
-		// Second column - Name
-		NameColumn,
-	};
-
-	explicit MojangAccountList(QObject *parent = 0);
-
-	//! Gets the account at the given index.
-	virtual const MojangAccountPtr at(int i) const;
-
-	//! Returns the number of accounts in the list.
-	virtual int count() const;
-
-	//////// List Model Functions ////////
-	virtual QVariant data(const QModelIndex &index, int role) const;
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-	virtual int rowCount(const QModelIndex &parent) const;
-	virtual int columnCount(const QModelIndex &parent) const;
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-	virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
-
-	/*!
-	 * Adds a the given Mojang account to the account list.
-	 */
-	virtual void addAccount(const MojangAccountPtr account);
-
-	/*!
-	 * Removes the mojang account with the given username from the account list.
-	 */
-	virtual void removeAccount(const QString &username);
-
-	/*!
-	 * Removes the account at the given QModelIndex.
-	 */
-	virtual void removeAccount(QModelIndex index);
-
-	/*!
-	 * \brief Finds an account by its username.
-	 * \param The username of the account to find.
-	 * \return A const pointer to the account with the given username. NULL if
-	 * one doesn't exist.
-	 */
-	virtual MojangAccountPtr findAccount(const QString &username) const;
-
-	/*!
-	 * Sets the default path to save the list file to.
-	 * If autosave is true, this list will automatically save to the given path whenever it changes.
-	 * THIS FUNCTION DOES NOT LOAD THE LIST. If you set autosave, be sure to call loadList() immediately
-	 * after calling this function to ensure an autosaved change doesn't overwrite the list you intended
-	 * to load.
-	 */
-	virtual void setListFilePath(QString path, bool autosave = false);
-
-	/*!
-	 * \brief Loads the account list from the given file path.
-	 * If the given file is an empty string (default), will load from the default account list file.
-	 * \return True if successful, otherwise false.
-	 */
-	virtual bool loadList(const QString &file = "");
-
-	/*!
-	 * \brief Saves the account list to the given file.
-	 * If the given file is an empty string (default), will save from the default account list file.
-	 * \return True if successful, otherwise false.
-	 */
-	virtual bool saveList(const QString &file = "");
-
-	/*!
-	 * \brief Gets a pointer to the account that the user has selected as their "active" account.
-	 * Which account is active can be overridden on a per-instance basis, but this will return the one that
-	 * is set as active globally.
-	 * \return The currently active MojangAccount. If there isn't an active account, returns a null pointer.
-	 */
-	virtual MojangAccountPtr activeAccount() const;
-
-	/*!
-	 * Sets the given account as the current active account.
-	 * If the username given is an empty string, sets the active account to nothing.
-	 */
-	virtual void setActiveAccount(const QString &username);
-
-	/*!
-	 * Returns true if any of the account is at least Validated
-	 */
-	bool anyAccountIsValid();
-
-signals:
-	/*!
-	 * Signal emitted to indicate that the account list has changed.
-	 * This will also fire if the value of an element in the list changes (will be implemented
-	 * later).
-	 */
-	void listChanged();
-
-	/*!
-	 * Signal emitted to indicate that the active account has changed.
-	 */
-	void activeAccountChanged();
-
-public
-slots:
-	/**
-	 * This is called when one of the accounts changes and the list needs to be updated
-	 */
-	void accountChanged();
-
-protected:
-	/*!
-	 * Called whenever the list changes.
-	 * This emits the listChanged() signal and autosaves the list (if autosave is enabled).
-	 */
-	void onListChanged();
-
-	/*!
-	 * Called whenever the active account changes.
-	 * Emits the activeAccountChanged() signal and autosaves the list if enabled.
-	 */
-	void onActiveChanged();
-
-	QList<MojangAccountPtr> m_accounts;
-
-	/*!
-	 * Account that is currently active.
-	 */
-	MojangAccountPtr m_activeAccount;
-
-	//! Path to the account list file. Empty string if there isn't one.
-	QString m_listFilePath;
-
-	/*!
-	 * If true, the account list will automatically save to the account list path when it changes.
-	 * Ignored if m_listFilePath is blank.
-	 */
-	bool m_autosave = false;
-
-protected
-slots:
-	/*!
-	 * Updates this list with the given list of accounts.
-	 * This is done by copying each account in the given list and inserting it
-	 * into this one.
-	 * We need to do this so that we can set the parents of the accounts are set to this
-	 * account list. This can't be done in the load task, because the accounts the load
-	 * task creates are on the load task's thread and Qt won't allow their parents
-	 * to be set to something created on another thread.
-	 * To get around that problem, we invoke this method on the GUI thread, which
-	 * then copies the accounts and sets their parents correctly.
-	 * \param accounts List of accounts whose parents should be set.
-	 */
-	virtual void updateListData(QList<MojangAccountPtr> versions);
-};
diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.cpp b/libraries/logic/minecraft/auth/YggdrasilTask.cpp
deleted file mode 100644
index c6971c9f..00000000
--- a/libraries/logic/minecraft/auth/YggdrasilTask.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "YggdrasilTask.h"
-#include "MojangAccount.h"
-
-#include <QObject>
-#include <QString>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QNetworkReply>
-#include <QByteArray>
-
-#include <Env.h>
-
-#include <net/URLConstants.h>
-
-#include <QDebug>
-
-YggdrasilTask::YggdrasilTask(MojangAccount *account, QObject *parent)
-	: Task(parent), m_account(account)
-{
-	changeState(STATE_CREATED);
-}
-
-void YggdrasilTask::executeTask()
-{
-	changeState(STATE_SENDING_REQUEST);
-
-	// Get the content of the request we're going to send to the server.
-	QJsonDocument doc(getRequestContent());
-
-	auto worker = ENV.qnam();
-	QUrl reqUrl("https://" + URLConstants::AUTH_BASE + getEndpoint());
-	QNetworkRequest netRequest(reqUrl);
-	netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-	QByteArray requestData = doc.toJson();
-	m_netReply = worker->post(netRequest, requestData);
-	connect(m_netReply, &QNetworkReply::finished, this, &YggdrasilTask::processReply);
-	connect(m_netReply, &QNetworkReply::uploadProgress, this, &YggdrasilTask::refreshTimers);
-	connect(m_netReply, &QNetworkReply::downloadProgress, this, &YggdrasilTask::refreshTimers);
-	connect(m_netReply, &QNetworkReply::sslErrors, this, &YggdrasilTask::sslErrors);
-	timeout_keeper.setSingleShot(true);
-	timeout_keeper.start(timeout_max);
-	counter.setSingleShot(false);
-	counter.start(time_step);
-	progress(0, timeout_max);
-	connect(&timeout_keeper, &QTimer::timeout, this, &YggdrasilTask::abortByTimeout);
-	connect(&counter, &QTimer::timeout, this, &YggdrasilTask::heartbeat);
-}
-
-void YggdrasilTask::refreshTimers(qint64, qint64)
-{
-	timeout_keeper.stop();
-	timeout_keeper.start(timeout_max);
-	progress(count = 0, timeout_max);
-}
-void YggdrasilTask::heartbeat()
-{
-	count += time_step;
-	progress(count, timeout_max);
-}
-
-bool YggdrasilTask::abort()
-{
-	progress(timeout_max, timeout_max);
-	// TODO: actually use this in a meaningful way
-	m_aborted = YggdrasilTask::BY_USER;
-	m_netReply->abort();
-	return true;
-}
-
-void YggdrasilTask::abortByTimeout()
-{
-	progress(timeout_max, timeout_max);
-	// TODO: actually use this in a meaningful way
-	m_aborted = YggdrasilTask::BY_TIMEOUT;
-	m_netReply->abort();
-}
-
-void YggdrasilTask::sslErrors(QList<QSslError> errors)
-{
-	int i = 1;
-	for (auto error : errors)
-	{
-		qCritical() << "LOGIN SSL Error #" << i << " : " << error.errorString();
-		auto cert = error.certificate();
-		qCritical() << "Certificate in question:\n" << cert.toText();
-		i++;
-	}
-}
-
-void YggdrasilTask::processReply()
-{
-	changeState(STATE_PROCESSING_RESPONSE);
-
-	switch (m_netReply->error())
-	{
-	case QNetworkReply::NoError:
-		break;
-	case QNetworkReply::TimeoutError:
-		changeState(STATE_FAILED_SOFT, tr("Authentication operation timed out."));
-		return;
-	case QNetworkReply::OperationCanceledError:
-		changeState(STATE_FAILED_SOFT, tr("Authentication operation cancelled."));
-		return;
-	case QNetworkReply::SslHandshakeFailedError:
-		changeState(
-			STATE_FAILED_SOFT,
-			tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
-			   "<ul>"
-			   "<li>You use Windows XP and need to <a "
-			   "href=\"http://www.microsoft.com/en-us/download/details.aspx?id=38918\">update "
-			   "your root certificates</a></li>"
-			   "<li>Some device on your network is interfering with SSL traffic. In that case, "
-			   "you have bigger worries than Minecraft not starting.</li>"
-			   "<li>Possibly something else. Check the MultiMC log file for details</li>"
-			   "</ul>"));
-		return;
-	// used for invalid credentials and similar errors. Fall through.
-	case QNetworkReply::ContentOperationNotPermittedError:
-		break;
-	default:
-		changeState(STATE_FAILED_SOFT,
-					tr("Authentication operation failed due to a network error: %1 (%2)")
-						.arg(m_netReply->errorString()).arg(m_netReply->error()));
-		return;
-	}
-
-	// Try to parse the response regardless of the response code.
-	// Sometimes the auth server will give more information and an error code.
-	QJsonParseError jsonError;
-	QByteArray replyData = m_netReply->readAll();
-	QJsonDocument doc = QJsonDocument::fromJson(replyData, &jsonError);
-	// Check the response code.
-	int responseCode = m_netReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-
-	if (responseCode == 200)
-	{
-		// If the response code was 200, then there shouldn't be an error. Make sure
-		// anyways.
-		// Also, sometimes an empty reply indicates success. If there was no data received,
-		// pass an empty json object to the processResponse function.
-		if (jsonError.error == QJsonParseError::NoError || replyData.size() == 0)
-		{
-			processResponse(replyData.size() > 0 ? doc.object() : QJsonObject());
-			return;
-		}
-		else
-		{
-			changeState(STATE_FAILED_SOFT, tr("Failed to parse authentication server response "
-											  "JSON response: %1 at offset %2.")
-											   .arg(jsonError.errorString())
-											   .arg(jsonError.offset));
-			qCritical() << replyData;
-		}
-		return;
-	}
-
-	// If the response code was not 200, then Yggdrasil may have given us information
-	// about the error.
-	// If we can parse the response, then get information from it. Otherwise just say
-	// there was an unknown error.
-	if (jsonError.error == QJsonParseError::NoError)
-	{
-		// We were able to parse the server's response. Woo!
-		// Call processError. If a subclass has overridden it then they'll handle their
-		// stuff there.
-		qDebug() << "The request failed, but the server gave us an error message. "
-						"Processing error.";
-		processError(doc.object());
-	}
-	else
-	{
-		// The server didn't say anything regarding the error. Give the user an unknown
-		// error.
-		qDebug()
-			<< "The request failed and the server gave no error message. Unknown error.";
-		changeState(STATE_FAILED_SOFT,
-					tr("An unknown error occurred when trying to communicate with the "
-					   "authentication server: %1").arg(m_netReply->errorString()));
-	}
-}
-
-void YggdrasilTask::processError(QJsonObject responseData)
-{
-	QJsonValue errorVal = responseData.value("error");
-	QJsonValue errorMessageValue = responseData.value("errorMessage");
-	QJsonValue causeVal = responseData.value("cause");
-
-	if (errorVal.isString() && errorMessageValue.isString())
-	{
-		m_error = std::shared_ptr<Error>(new Error{
-			errorVal.toString(""), errorMessageValue.toString(""), causeVal.toString("")});
-		changeState(STATE_FAILED_HARD, m_error->m_errorMessageVerbose);
-	}
-	else
-	{
-		// Error is not in standard format. Don't set m_error and return unknown error.
-		changeState(STATE_FAILED_HARD, tr("An unknown Yggdrasil error occurred."));
-	}
-}
-
-QString YggdrasilTask::getStateMessage() const
-{
-	switch (m_state)
-	{
-	case STATE_CREATED:
-		return "Waiting...";
-	case STATE_SENDING_REQUEST:
-		return tr("Sending request to auth servers...");
-	case STATE_PROCESSING_RESPONSE:
-		return tr("Processing response from servers...");
-	case STATE_SUCCEEDED:
-		return tr("Authentication task succeeded.");
-	case STATE_FAILED_SOFT:
-		return tr("Failed to contact the authentication server.");
-	case STATE_FAILED_HARD:
-		return tr("Failed to authenticate.");
-	default:
-		return tr("...");
-	}
-}
-
-void YggdrasilTask::changeState(YggdrasilTask::State newState, QString reason)
-{
-	m_state = newState;
-	setStatus(getStateMessage());
-	if (newState == STATE_SUCCEEDED)
-	{
-		emitSucceeded();
-	}
-	else if (newState == STATE_FAILED_HARD || newState == STATE_FAILED_SOFT)
-	{
-		emitFailed(reason);
-	}
-}
-
-YggdrasilTask::State YggdrasilTask::state()
-{
-	return m_state;
-}
diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.h b/libraries/logic/minecraft/auth/YggdrasilTask.h
deleted file mode 100644
index c84cfc06..00000000
--- a/libraries/logic/minecraft/auth/YggdrasilTask.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <tasks/Task.h>
-
-#include <QString>
-#include <QJsonObject>
-#include <QTimer>
-#include <qsslerror.h>
-
-#include "MojangAccount.h"
-
-class QNetworkReply;
-
-/**
- * A Yggdrasil task is a task that performs an operation on a given mojang account.
- */
-class YggdrasilTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit YggdrasilTask(MojangAccount * account, QObject *parent = 0);
-
-	/**
-	 * assign a session to this task. the session will be filled with required infomration
-	 * upon completion
-	 */
-	void assignSession(AuthSessionPtr session)
-	{
-		m_session = session;
-	}
-
-	/// get the assigned session for filling with information.
-	AuthSessionPtr getAssignedSession()
-	{
-		return m_session;
-	}
-
-	/**
-	 * Class describing a Yggdrasil error response.
-	 */
-	struct Error
-	{
-		QString m_errorMessageShort;
-		QString m_errorMessageVerbose;
-		QString m_cause;
-	};
-
-	enum AbortedBy
-	{
-		BY_NOTHING,
-		BY_USER,
-		BY_TIMEOUT
-	} m_aborted = BY_NOTHING;
-
-	/**
-	 * Enum for describing the state of the current task.
-	 * Used by the getStateMessage function to determine what the status message should be.
-	 */
-	enum State
-	{
-		STATE_CREATED,
-		STATE_SENDING_REQUEST,
-		STATE_PROCESSING_RESPONSE,
-		STATE_FAILED_SOFT, //!< soft failure. this generally means the user auth details haven't been invalidated
-		STATE_FAILED_HARD, //!< hard failure. auth is invalid
-		STATE_SUCCEEDED
-	} m_state = STATE_CREATED;
-
-protected:
-
-	virtual void executeTask() override;
-
-	/**
-	 * Gets the JSON object that will be sent to the authentication server.
-	 * Should be overridden by subclasses.
-	 */
-	virtual QJsonObject getRequestContent() const = 0;
-
-	/**
-	 * Gets the endpoint to POST to.
-	 * No leading slash.
-	 */
-	virtual QString getEndpoint() const = 0;
-
-	/**
-	 * Processes the response received from the server.
-	 * If an error occurred, this should emit a failed signal and return false.
-	 * If Yggdrasil gave an error response, it should call setError() first, and then return false.
-	 * Otherwise, it should return true.
-	 * Note: If the response from the server was blank, and the HTTP code was 200, this function is called with
-	 * an empty QJsonObject.
-	 */
-	virtual void processResponse(QJsonObject responseData) = 0;
-
-	/**
-	 * Processes an error response received from the server.
-	 * The default implementation will read data from Yggdrasil's standard error response format and set it as this task's Error.
-	 * \returns a QString error message that will be passed to emitFailed.
-	 */
-	virtual void processError(QJsonObject responseData);
-
-	/**
-	 * Returns the state message for the given state.
-	 * Used to set the status message for the task.
-	 * Should be overridden by subclasses that want to change messages for a given state.
-	 */
-	virtual QString getStateMessage() const;
-
-protected
-slots:
-	void processReply();
-	void refreshTimers(qint64, qint64);
-	void heartbeat();
-	void sslErrors(QList<QSslError>);
-
-	void changeState(State newState, QString reason=QString());
-public
-slots:
-	virtual bool abort() override;
-	void abortByTimeout();
-	State state();
-protected:
-	// FIXME: segfault disaster waiting to happen
-	MojangAccount *m_account = nullptr;
-	QNetworkReply *m_netReply = nullptr;
-	std::shared_ptr<Error> m_error;
-	QTimer timeout_keeper;
-	QTimer counter;
-	int count = 0; // num msec since time reset
-
-	const int timeout_max = 30000;
-	const int time_step = 50;
-
-	AuthSessionPtr m_session;
-};
diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp b/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp
deleted file mode 100644
index 8d136f0b..00000000
--- a/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "AuthenticateTask.h"
-#include "../MojangAccount.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QVariant>
-
-#include <QDebug>
-#include <QUuid>
-
-AuthenticateTask::AuthenticateTask(MojangAccount * account, const QString &password,
-								   QObject *parent)
-	: YggdrasilTask(account, parent), m_password(password)
-{
-}
-
-QJsonObject AuthenticateTask::getRequestContent() const
-{
-	/*
-	 * {
-	 *   "agent": {								// optional
-	 *   "name": "Minecraft",					// So far this is the only encountered value
-	 *   "version": 1							// This number might be increased
-	 * 											// by the vanilla client in the future
-	 *   },
-	 *   "username": "mojang account name",		// Can be an email address or player name for
-												// unmigrated accounts
-	 *  "password": "mojang account password",
-	 *  "clientToken": "client identifier"		// optional
-	 *  "requestUser": true/false               // request the user structure
-	 * }
-	 */
-	QJsonObject req;
-
-	{
-		QJsonObject agent;
-		// C++ makes string literals void* for some stupid reason, so we have to tell it
-		// QString... Thanks Obama.
-		agent.insert("name", QString("Minecraft"));
-		agent.insert("version", 1);
-		req.insert("agent", agent);
-	}
-
-	req.insert("username", m_account->username());
-	req.insert("password", m_password);
-	req.insert("requestUser", true);
-
-	// If we already have a client token, give it to the server.
-	// Otherwise, let the server give us one.
-
-	if(m_account->m_clientToken.isEmpty())
-	{
-		auto uuid = QUuid::createUuid();
-		auto uuidString = uuid.toString().remove('{').remove('-').remove('}');
-		m_account->m_clientToken = uuidString;
-	}
-	req.insert("clientToken", m_account->m_clientToken);
-
-	return req;
-}
-
-void AuthenticateTask::processResponse(QJsonObject responseData)
-{
-	// Read the response data. We need to get the client token, access token, and the selected
-	// profile.
-	qDebug() << "Processing authentication response.";
-	// qDebug() << responseData;
-	// If we already have a client token, make sure the one the server gave us matches our
-	// existing one.
-	qDebug() << "Getting client token.";
-	QString clientToken = responseData.value("clientToken").toString("");
-	if (clientToken.isEmpty())
-	{
-		// Fail if the server gave us an empty client token
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't send a client token."));
-		return;
-	}
-	if (!m_account->m_clientToken.isEmpty() && clientToken != m_account->m_clientToken)
-	{
-		changeState(STATE_FAILED_HARD, tr("Authentication server attempted to change the client token. This isn't supported."));
-		return;
-	}
-	// Set the client token.
-	m_account->m_clientToken = clientToken;
-
-	// Now, we set the access token.
-	qDebug() << "Getting access token.";
-	QString accessToken = responseData.value("accessToken").toString("");
-	if (accessToken.isEmpty())
-	{
-		// Fail if the server didn't give us an access token.
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't send an access token."));
-		return;
-	}
-	// Set the access token.
-	m_account->m_accessToken = accessToken;
-
-	// Now we load the list of available profiles.
-	// Mojang hasn't yet implemented the profile system,
-	// but we might as well support what's there so we
-	// don't have trouble implementing it later.
-	qDebug() << "Loading profile list.";
-	QJsonArray availableProfiles = responseData.value("availableProfiles").toArray();
-	QList<AccountProfile> loadedProfiles;
-	for (auto iter : availableProfiles)
-	{
-		QJsonObject profile = iter.toObject();
-		// Profiles are easy, we just need their ID and name.
-		QString id = profile.value("id").toString("");
-		QString name = profile.value("name").toString("");
-		bool legacy = profile.value("legacy").toBool(false);
-
-		if (id.isEmpty() || name.isEmpty())
-		{
-			// This should never happen, but we might as well
-			// warn about it if it does so we can debug it easily.
-			// You never know when Mojang might do something truly derpy.
-			qWarning() << "Found entry in available profiles list with missing ID or name "
-						   "field. Ignoring it.";
-		}
-
-		// Now, add a new AccountProfile entry to the list.
-		loadedProfiles.append({id, name, legacy});
-	}
-	// Put the list of profiles we loaded into the MojangAccount object.
-	m_account->m_profiles = loadedProfiles;
-
-	// Finally, we set the current profile to the correct value. This is pretty simple.
-	// We do need to make sure that the current profile that the server gave us
-	// is actually in the available profiles list.
-	// If it isn't, we'll just fail horribly (*shouldn't* ever happen, but you never know).
-	qDebug() << "Setting current profile.";
-	QJsonObject currentProfile = responseData.value("selectedProfile").toObject();
-	QString currentProfileId = currentProfile.value("id").toString("");
-	if (currentProfileId.isEmpty())
-	{
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't specify a currently selected profile. The account exists, but likely isn't premium."));
-		return;
-	}
-	if (!m_account->setCurrentProfile(currentProfileId))
-	{
-		changeState(STATE_FAILED_HARD, tr("Authentication server specified a selected profile that wasn't in the available profiles list."));
-		return;
-	}
-
-	// this is what the vanilla launcher passes to the userProperties launch param
-	if (responseData.contains("user"))
-	{
-		User u;
-		auto obj = responseData.value("user").toObject();
-		u.id = obj.value("id").toString();
-		auto propArray = obj.value("properties").toArray();
-		for (auto prop : propArray)
-		{
-			auto propTuple = prop.toObject();
-			auto name = propTuple.value("name").toString();
-			auto value = propTuple.value("value").toString();
-			u.properties.insert(name, value);
-		}
-		m_account->m_user = u;
-	}
-
-	// We've made it through the minefield of possible errors. Return true to indicate that
-	// we've succeeded.
-	qDebug() << "Finished reading authentication response.";
-	changeState(STATE_SUCCEEDED);
-}
-
-QString AuthenticateTask::getEndpoint() const
-{
-	return "authenticate";
-}
-
-QString AuthenticateTask::getStateMessage() const
-{
-	switch (m_state)
-	{
-	case STATE_SENDING_REQUEST:
-		return tr("Authenticating: Sending request...");
-	case STATE_PROCESSING_RESPONSE:
-		return tr("Authenticating: Processing response...");
-	default:
-		return YggdrasilTask::getStateMessage();
-	}
-}
diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.h b/libraries/logic/minecraft/auth/flows/AuthenticateTask.h
deleted file mode 100644
index 398fab98..00000000
--- a/libraries/logic/minecraft/auth/flows/AuthenticateTask.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "../YggdrasilTask.h"
-
-#include <QObject>
-#include <QString>
-#include <QJsonObject>
-
-/**
- * The authenticate task takes a MojangAccount with no access token and password and attempts to
- * authenticate with Mojang's servers.
- * If successful, it will set the MojangAccount's access token.
- */
-class AuthenticateTask : public YggdrasilTask
-{
-	Q_OBJECT
-public:
-	AuthenticateTask(MojangAccount *account, const QString &password, QObject *parent = 0);
-
-protected:
-	virtual QJsonObject getRequestContent() const override;
-
-	virtual QString getEndpoint() const override;
-
-	virtual void processResponse(QJsonObject responseData) override;
-
-	virtual QString getStateMessage() const override;
-
-private:
-	QString m_password;
-};
diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.cpp b/libraries/logic/minecraft/auth/flows/RefreshTask.cpp
deleted file mode 100644
index a0fb2e48..00000000
--- a/libraries/logic/minecraft/auth/flows/RefreshTask.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "RefreshTask.h"
-#include "../MojangAccount.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QVariant>
-
-#include <QDebug>
-
-RefreshTask::RefreshTask(MojangAccount *account) : YggdrasilTask(account)
-{
-}
-
-QJsonObject RefreshTask::getRequestContent() const
-{
-	/*
-	 * {
-	 *  "clientToken": "client identifier"
-	 *  "accessToken": "current access token to be refreshed"
-	 *  "selectedProfile":                      // specifying this causes errors
-	 *  {
-	 *   "id": "profile ID"
-	 *   "name": "profile name"
-	 *  }
-	 *  "requestUser": true/false               // request the user structure
-	 * }
-	 */
-	QJsonObject req;
-	req.insert("clientToken", m_account->m_clientToken);
-	req.insert("accessToken", m_account->m_accessToken);
-	/*
-	{
-		auto currentProfile = m_account->currentProfile();
-		QJsonObject profile;
-		profile.insert("id", currentProfile->id());
-		profile.insert("name", currentProfile->name());
-		req.insert("selectedProfile", profile);
-	}
-	*/
-	req.insert("requestUser", true);
-
-	return req;
-}
-
-void RefreshTask::processResponse(QJsonObject responseData)
-{
-	// Read the response data. We need to get the client token, access token, and the selected
-	// profile.
-	qDebug() << "Processing authentication response.";
-
-	// qDebug() << responseData;
-	// If we already have a client token, make sure the one the server gave us matches our
-	// existing one.
-	QString clientToken = responseData.value("clientToken").toString("");
-	if (clientToken.isEmpty())
-	{
-		// Fail if the server gave us an empty client token
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't send a client token."));
-		return;
-	}
-	if (!m_account->m_clientToken.isEmpty() && clientToken != m_account->m_clientToken)
-	{
-		changeState(STATE_FAILED_HARD, tr("Authentication server attempted to change the client token. This isn't supported."));
-		return;
-	}
-
-	// Now, we set the access token.
-	qDebug() << "Getting new access token.";
-	QString accessToken = responseData.value("accessToken").toString("");
-	if (accessToken.isEmpty())
-	{
-		// Fail if the server didn't give us an access token.
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't send an access token."));
-		return;
-	}
-
-	// we validate that the server responded right. (our current profile = returned current
-	// profile)
-	QJsonObject currentProfile = responseData.value("selectedProfile").toObject();
-	QString currentProfileId = currentProfile.value("id").toString("");
-	if (m_account->currentProfile()->id != currentProfileId)
-	{
-		changeState(STATE_FAILED_HARD, tr("Authentication server didn't specify the same prefile as expected."));
-		return;
-	}
-
-	// this is what the vanilla launcher passes to the userProperties launch param
-	if (responseData.contains("user"))
-	{
-		User u;
-		auto obj = responseData.value("user").toObject();
-		u.id = obj.value("id").toString();
-		auto propArray = obj.value("properties").toArray();
-		for (auto prop : propArray)
-		{
-			auto propTuple = prop.toObject();
-			auto name = propTuple.value("name").toString();
-			auto value = propTuple.value("value").toString();
-			u.properties.insert(name, value);
-		}
-		m_account->m_user = u;
-	}
-
-	// We've made it through the minefield of possible errors. Return true to indicate that
-	// we've succeeded.
-	qDebug() << "Finished reading refresh response.";
-	// Reset the access token.
-	m_account->m_accessToken = accessToken;
-	changeState(STATE_SUCCEEDED);
-}
-
-QString RefreshTask::getEndpoint() const
-{
-	return "refresh";
-}
-
-QString RefreshTask::getStateMessage() const
-{
-	switch (m_state)
-	{
-	case STATE_SENDING_REQUEST:
-		return tr("Refreshing login token...");
-	case STATE_PROCESSING_RESPONSE:
-		return tr("Refreshing login token: Processing response...");
-	default:
-		return YggdrasilTask::getStateMessage();
-	}
-}
diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.h b/libraries/logic/minecraft/auth/flows/RefreshTask.h
deleted file mode 100644
index 17714b4f..00000000
--- a/libraries/logic/minecraft/auth/flows/RefreshTask.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "../YggdrasilTask.h"
-
-#include <QObject>
-#include <QString>
-#include <QJsonObject>
-
-/**
- * The authenticate task takes a MojangAccount with a possibly timed-out access token
- * and attempts to authenticate with Mojang's servers.
- * If successful, it will set the new access token. The token is considered validated.
- */
-class RefreshTask : public YggdrasilTask
-{
-	Q_OBJECT
-public:
-	RefreshTask(MojangAccount * account);
-
-protected:
-	virtual QJsonObject getRequestContent() const override;
-
-	virtual QString getEndpoint() const override;
-
-	virtual void processResponse(QJsonObject responseData) override;
-
-	virtual QString getStateMessage() const override;
-};
-
diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.cpp b/libraries/logic/minecraft/auth/flows/ValidateTask.cpp
deleted file mode 100644
index 4deceb6a..00000000
--- a/libraries/logic/minecraft/auth/flows/ValidateTask.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ValidateTask.h"
-#include "../MojangAccount.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QVariant>
-
-#include <QDebug>
-
-ValidateTask::ValidateTask(MojangAccount * account, QObject *parent)
-	: YggdrasilTask(account, parent)
-{
-}
-
-QJsonObject ValidateTask::getRequestContent() const
-{
-	QJsonObject req;
-	req.insert("accessToken", m_account->m_accessToken);
-	return req;
-}
-
-void ValidateTask::processResponse(QJsonObject responseData)
-{
-	// Assume that if processError wasn't called, then the request was successful.
-	changeState(YggdrasilTask::STATE_SUCCEEDED);
-}
-
-QString ValidateTask::getEndpoint() const
-{
-	return "validate";
-}
-
-QString ValidateTask::getStateMessage() const
-{
-	switch (m_state)
-	{
-	case YggdrasilTask::STATE_SENDING_REQUEST:
-		return tr("Validating access token: Sending request...");
-	case YggdrasilTask::STATE_PROCESSING_RESPONSE:
-		return tr("Validating access token: Processing response...");
-	default:
-		return YggdrasilTask::getStateMessage();
-	}
-}
diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.h b/libraries/logic/minecraft/auth/flows/ValidateTask.h
deleted file mode 100644
index 77d628a0..00000000
--- a/libraries/logic/minecraft/auth/flows/ValidateTask.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * :FIXME: DEAD CODE, DEAD CODE, DEAD CODE! :FIXME:
- */
-
-#pragma once
-
-#include "../YggdrasilTask.h"
-
-#include <QObject>
-#include <QString>
-#include <QJsonObject>
-
-/**
- * The validate task takes a MojangAccount and checks to make sure its access token is valid.
- */
-class ValidateTask : public YggdrasilTask
-{
-	Q_OBJECT
-public:
-	ValidateTask(MojangAccount *account, QObject *parent = 0);
-
-protected:
-	virtual QJsonObject getRequestContent() const override;
-
-	virtual QString getEndpoint() const override;
-
-	virtual void processResponse(QJsonObject responseData) override;
-
-	virtual QString getStateMessage() const override;
-
-private:
-};
diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.cpp b/libraries/logic/minecraft/forge/ForgeInstaller.cpp
deleted file mode 100644
index 353328ab..00000000
--- a/libraries/logic/minecraft/forge/ForgeInstaller.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ForgeInstaller.h"
-#include "ForgeVersionList.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/GradleSpecifier.h"
-#include "net/HttpMetaCache.h"
-#include "tasks/Task.h"
-#include "minecraft/onesix/OneSixInstance.h"
-#include <minecraft/onesix/OneSixVersionFormat.h>
-#include "minecraft/VersionFilterData.h"
-#include "minecraft/MinecraftVersion.h"
-#include "Env.h"
-#include "Exception.h"
-#include <FileSystem.h>
-
-#include <quazip.h>
-#include <quazipfile.h>
-#include <QStringList>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QSaveFile>
-#include <QCryptographicHash>
-
-ForgeInstaller::ForgeInstaller() : BaseInstaller()
-{
-}
-
-void ForgeInstaller::prepare(const QString &filename, const QString &universalUrl)
-{
-	VersionFilePtr newVersion;
-	m_universal_url = universalUrl;
-
-	QuaZip zip(filename);
-	if (!zip.open(QuaZip::mdUnzip))
-		return;
-
-	QuaZipFile file(&zip);
-
-	// read the install profile
-	if (!zip.setCurrentFile("install_profile.json"))
-		return;
-
-	QJsonParseError jsonError;
-	if (!file.open(QIODevice::ReadOnly))
-		return;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(file.readAll(), &jsonError);
-	file.close();
-	if (jsonError.error != QJsonParseError::NoError)
-		return;
-
-	if (!jsonDoc.isObject())
-		return;
-
-	QJsonObject root = jsonDoc.object();
-
-	auto installVal = root.value("install");
-	auto versionInfoVal = root.value("versionInfo");
-	if (!installVal.isObject() || !versionInfoVal.isObject())
-		return;
-
-	try
-	{
-		newVersion = OneSixVersionFormat::versionFileFromJson(QJsonDocument(versionInfoVal.toObject()), QString(), false);
-	}
-	catch(Exception &err)
-	{
-		qWarning() << "Forge: Fatal error while parsing version file:" << err.what();
-		return;
-	}
-
-	for(auto problem: newVersion->getProblems())
-	{
-		qWarning() << "Forge: Problem found: " << problem.getDescription();
-	}
-	if(newVersion->getProblemSeverity() == ProblemSeverity::PROBLEM_ERROR)
-	{
-		qWarning() << "Forge: Errors found while parsing version file";
-		return;
-	}
-
-	QJsonObject installObj = installVal.toObject();
-	QString libraryName = installObj.value("path").toString();
-	internalPath = installObj.value("filePath").toString();
-	m_forgeVersionString = installObj.value("version").toString().remove("Forge", Qt::CaseInsensitive).trimmed();
-
-	// where do we put the library? decode the mojang path
-	GradleSpecifier lib(libraryName);
-
-	auto cacheentry = ENV.metacache()->resolveEntry("libraries", lib.toPath());
-	finalPath = "libraries/" + lib.toPath();
-	if (!FS::ensureFilePathExists(finalPath))
-		return;
-
-	if (!zip.setCurrentFile(internalPath))
-		return;
-	if (!file.open(QIODevice::ReadOnly))
-		return;
-	{
-		QByteArray data = file.readAll();
-		// extract file
-		QSaveFile extraction(finalPath);
-		if (!extraction.open(QIODevice::WriteOnly))
-			return;
-		if (extraction.write(data) != data.size())
-			return;
-		if (!extraction.commit())
-			return;
-		QCryptographicHash md5sum(QCryptographicHash::Md5);
-		md5sum.addData(data);
-
-		cacheentry->setStale(false);
-		cacheentry->setMD5Sum(md5sum.result().toHex().constData());
-		ENV.metacache()->updateEntry(cacheentry);
-	}
-	file.close();
-
-	m_forge_json = newVersion;
-}
-
-bool ForgeInstaller::add(OneSixInstance *to)
-{
-	if (!BaseInstaller::add(to))
-	{
-		return false;
-	}
-
-	if (!m_forge_json)
-	{
-		return false;
-	}
-
-	// A blacklist
-	QSet<QString> blacklist{"authlib", "realms"};
-	QList<QString> xzlist{"org.scala-lang", "com.typesafe"};
-
-	// get the minecraft version from the instance
-	VersionFilePtr minecraft;
-	auto minecraftPatch = to->getMinecraftProfile()->versionPatch("net.minecraft");
-	if(minecraftPatch)
-	{
-		minecraft = std::dynamic_pointer_cast<VersionFile>(minecraftPatch);
-		if(!minecraft)
-		{
-			auto mcWrap = std::dynamic_pointer_cast<MinecraftVersion>(minecraftPatch);
-			if(mcWrap)
-			{
-				minecraft = mcWrap->getVersionFile();
-			}
-		}
-	}
-
-	// for each library in the version we are adding (except for the blacklisted)
-	QMutableListIterator<LibraryPtr> iter(m_forge_json->libraries);
-	while (iter.hasNext())
-	{
-		auto library = iter.next();
-		QString libName = library->artifactId();
-		QString libVersion = library->version();
-		QString rawName = library->rawName();
-
-		// ignore lwjgl libraries.
-		if (g_VersionFilterData.lwjglWhitelist.contains(library->artifactPrefix()))
-		{
-			iter.remove();
-			continue;
-		}
-		// ignore other blacklisted (realms, authlib)
-		if (blacklist.contains(libName))
-		{
-			iter.remove();
-			continue;
-		}
-		// if minecraft version was found, ignore everything that is already in the minecraft version
-		if(minecraft)
-		{
-			bool found = false;
-			for (auto & lib: minecraft->libraries)
-			{
-				if(library->artifactPrefix() == lib->artifactPrefix() && library->version() == lib->version())
-				{
-					found = true;
-					break;
-				}
-			}
-			if (found)
-				continue;
-		}
-
-		// if this is the actual forge lib, set an absolute url for the download
-		if (m_forge_version->type == ForgeVersion::Gradle)
-		{
-			if (libName == "forge")
-			{
-				library->setClassifier("universal");
-			}
-			else if (libName == "minecraftforge")
-			{
-				QString forgeCoord("net.minecraftforge:forge:%1:universal");
-				// using insane form of the MC version...
-				QString longVersion = m_forge_version->mcver + "-" + m_forge_version->jobbuildver;
-				GradleSpecifier spec(forgeCoord.arg(longVersion));
-				library->setRawName(spec);
-			}
-		}
-		else
-		{
-			if (libName.contains("minecraftforge"))
-			{
-				library->setAbsoluteUrl(m_universal_url);
-			}
-		}
-
-		// mark bad libraries based on the xzlist above
-		for (auto entry : xzlist)
-		{
-			qDebug() << "Testing " << rawName << " : " << entry;
-			if (rawName.startsWith(entry))
-			{
-				library->setHint("forge-pack-xz");
-				break;
-			}
-		}
-	}
-	QString &args = m_forge_json->minecraftArguments;
-	QStringList tweakers;
-	{
-		QRegularExpression expression("--tweakClass ([a-zA-Z0-9\\.]*)");
-		QRegularExpressionMatch match = expression.match(args);
-		while (match.hasMatch())
-		{
-			tweakers.append(match.captured(1));
-			args.remove(match.capturedStart(), match.capturedLength());
-			match = expression.match(args);
-		}
-		if(tweakers.size())
-		{
-			args.operator=(args.trimmed());
-			m_forge_json->addTweakers = tweakers;
-		}
-	}
-	if(minecraft && args == minecraft->minecraftArguments)
-	{
-		args.clear();
-	}
-
-	m_forge_json->name = "Forge";
-	m_forge_json->fileId = id();
-	m_forge_json->version = m_forgeVersionString;
-	m_forge_json->dependsOnMinecraftVersion = to->intendedVersionId();
-	m_forge_json->order = 5;
-
-	// reset some things we do not want to be passed along.
-	m_forge_json->m_releaseTime = QDateTime();
-	m_forge_json->m_updateTime = QDateTime();
-	m_forge_json->minimumLauncherVersion = -1;
-	m_forge_json->type.clear();
-	m_forge_json->minecraftArguments.clear();
-	m_forge_json->minecraftVersion.clear();
-
-	QSaveFile file(filename(to->instanceRoot()));
-	if (!file.open(QFile::WriteOnly))
-	{
-		qCritical() << "Error opening" << file.fileName()
-					 << "for reading:" << file.errorString();
-		return false;
-	}
-	file.write(OneSixVersionFormat::versionFileToJson(m_forge_json, true).toJson());
-	file.commit();
-
-	return true;
-}
-
-bool ForgeInstaller::addLegacy(OneSixInstance *to)
-{
-	if (!BaseInstaller::add(to))
-	{
-		return false;
-	}
-	auto entry = ENV.metacache()->resolveEntry("minecraftforge", m_forge_version->filename());
-	finalPath = FS::PathCombine(to->jarModsDir(), m_forge_version->filename());
-	if (!FS::ensureFilePathExists(finalPath))
-	{
-		return false;
-	}
-	if (!QFile::copy(entry->getFullPath(), finalPath))
-	{
-		return false;
-	}
-	QJsonObject obj;
-	obj.insert("order", 5);
-	{
-		QJsonArray jarmodsPlus;
-		{
-			QJsonObject libObj;
-			libObj.insert("name", m_forge_version->universal_filename);
-			jarmodsPlus.append(libObj);
-		}
-		obj.insert("+jarMods", jarmodsPlus);
-	}
-
-	obj.insert("name", QString("Forge"));
-	obj.insert("fileId", id());
-	obj.insert("version", m_forge_version->jobbuildver);
-	obj.insert("mcVersion", to->intendedVersionId());
-	if (g_VersionFilterData.fmlLibsMapping.contains(m_forge_version->mcver))
-	{
-		QJsonArray traitsPlus;
-		traitsPlus.append(QString("legacyFML"));
-		obj.insert("+traits", traitsPlus);
-	}
-	auto fullversion = to->getMinecraftProfile();
-	fullversion->remove("net.minecraftforge");
-
-	QFile file(filename(to->instanceRoot()));
-	if (!file.open(QFile::WriteOnly))
-	{
-		qCritical() << "Error opening" << file.fileName()
-					 << "for reading:" << file.errorString();
-		return false;
-	}
-	file.write(QJsonDocument(obj).toJson());
-	file.close();
-	return true;
-}
-
-class ForgeInstallTask : public Task
-{
-	Q_OBJECT
-public:
-	ForgeInstallTask(ForgeInstaller *installer, OneSixInstance *instance,
-					 BaseVersionPtr version, QObject *parent = 0)
-		: Task(parent), m_installer(installer), m_instance(instance), m_version(version)
-	{
-	}
-
-protected:
-	void executeTask() override
-	{
-		setStatus(tr("Installing Forge..."));
-		ForgeVersionPtr forgeVersion = std::dynamic_pointer_cast<ForgeVersion>(m_version);
-		if (!forgeVersion)
-		{
-			emitFailed(tr("Unknown error occured"));
-			return;
-		}
-		prepare(forgeVersion);
-	}
-	void prepare(ForgeVersionPtr forgeVersion)
-	{
-		auto entry = ENV.metacache()->resolveEntry("minecraftforge", forgeVersion->filename());
-		auto installFunction = [this, entry, forgeVersion]()
-		{
-			if (!install(entry, forgeVersion))
-			{
-				qCritical() << "Failure installing Forge";
-				emitFailed(tr("Failure to install Forge"));
-			}
-			else
-			{
-				reload();
-			}
-		};
-
-		/*
-		 * HACK IF the local non-stale file is too small, mark is as stale
-		 *
-		 * This fixes some problems with bad files acquired because of unhandled HTTP redirects
-		 * in old versions of MultiMC.
-		 */
-		if (!entry->isStale())
-		{
-			QFileInfo localFile(entry->getFullPath());
-			if (localFile.size() <= 0x4000)
-			{
-				entry->setStale(true);
-			}
-		}
-
-		if (entry->isStale())
-		{
-			NetJob *fjob = new NetJob("Forge download");
-			fjob->addNetAction(CacheDownload::make(forgeVersion->url(), entry));
-			connect(fjob, &NetJob::progress, this, &Task::setProgress);
-			connect(fjob, &NetJob::status, this, &Task::setStatus);
-			connect(fjob, &NetJob::failed, [this](QString reason)
-			{ emitFailed(tr("Failure to download Forge:\n%1").arg(reason)); });
-			connect(fjob, &NetJob::succeeded, installFunction);
-			fjob->start();
-		}
-		else
-		{
-			installFunction();
-		}
-	}
-	bool install(const std::shared_ptr<MetaEntry> &entry, const ForgeVersionPtr &forgeVersion)
-	{
-		if (forgeVersion->usesInstaller())
-		{
-			QString forgePath = entry->getFullPath();
-			m_installer->prepare(forgePath, forgeVersion->universal_url);
-			return m_installer->add(m_instance);
-		}
-		else
-			return m_installer->addLegacy(m_instance);
-	}
-	void reload()
-	{
-		try
-		{
-			m_instance->reloadProfile();
-			emitSucceeded();
-		}
-		catch (Exception &e)
-		{
-			emitFailed(e.cause());
-		}
-		catch (...)
-		{
-			emitFailed(tr("Failed to load the version description file for reasons unknown."));
-		}
-	}
-
-private:
-	ForgeInstaller *m_installer;
-	OneSixInstance *m_instance;
-	BaseVersionPtr m_version;
-};
-
-Task *ForgeInstaller::createInstallTask(OneSixInstance *instance,
-													BaseVersionPtr version, QObject *parent)
-{
-	if (!version)
-	{
-		return nullptr;
-	}
-	m_forge_version = std::dynamic_pointer_cast<ForgeVersion>(version);
-	return new ForgeInstallTask(this, instance, version, parent);
-}
-
-#include "ForgeInstaller.moc"
diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.h b/libraries/logic/minecraft/forge/ForgeInstaller.h
deleted file mode 100644
index 499a6fb3..00000000
--- a/libraries/logic/minecraft/forge/ForgeInstaller.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "BaseInstaller.h"
-
-#include <QString>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class VersionFile;
-class ForgeInstallTask;
-struct ForgeVersion;
-
-class MULTIMC_LOGIC_EXPORT ForgeInstaller : public BaseInstaller
-{
-	friend class ForgeInstallTask;
-public:
-	ForgeInstaller();
-	virtual ~ForgeInstaller(){}
-	virtual Task *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override;
-	virtual QString id() const override { return "net.minecraftforge"; }
-
-protected:
-	void prepare(const QString &filename, const QString &universalUrl);
-	bool add(OneSixInstance *to) override;
-	bool addLegacy(OneSixInstance *to);
-
-private:
-	// the parsed version json, read from the installer
-	std::shared_ptr<VersionFile> m_forge_json;
-	// the actual forge version
-	std::shared_ptr<ForgeVersion> m_forge_version;
-	QString internalPath;
-	QString finalPath;
-	QString m_forgeVersionString;
-	QString m_universal_url;
-};
diff --git a/libraries/logic/minecraft/forge/ForgeVersion.cpp b/libraries/logic/minecraft/forge/ForgeVersion.cpp
deleted file mode 100644
index b859a28c..00000000
--- a/libraries/logic/minecraft/forge/ForgeVersion.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "ForgeVersion.h"
-#include "minecraft/VersionFilterData.h"
-#include <QObject>
-
-QString ForgeVersion::name()
-{
-	return "Forge " + jobbuildver;
-}
-
-QString ForgeVersion::descriptor()
-{
-	return universal_filename;
-}
-
-QString ForgeVersion::typeString() const
-{
-	if (is_recommended)
-		return QObject::tr("Recommended");
-	return QString();
-}
-
-bool ForgeVersion::operator<(BaseVersion &a)
-{
-	ForgeVersion *pa = dynamic_cast<ForgeVersion *>(&a);
-	if (!pa)
-		return true;
-	return m_buildnr < pa->m_buildnr;
-}
-
-bool ForgeVersion::operator>(BaseVersion &a)
-{
-	ForgeVersion *pa = dynamic_cast<ForgeVersion *>(&a);
-	if (!pa)
-		return false;
-	return m_buildnr > pa->m_buildnr;
-}
-
-bool ForgeVersion::usesInstaller()
-{
-	if(installer_url.isEmpty())
-		return false;
-	if(g_VersionFilterData.forgeInstallerBlacklist.contains(mcver))
-		return false;
-	return true;
-}
-
-QString ForgeVersion::filename()
-{
-	return usesInstaller() ? installer_filename : universal_filename;
-}
-
-QString ForgeVersion::url()
-{
-	return usesInstaller() ? installer_url : universal_url;
-}
diff --git a/libraries/logic/minecraft/forge/ForgeVersion.h b/libraries/logic/minecraft/forge/ForgeVersion.h
deleted file mode 100644
index e77d32f1..00000000
--- a/libraries/logic/minecraft/forge/ForgeVersion.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-#include <QString>
-#include <memory>
-#include "BaseVersion.h"
-
-struct ForgeVersion;
-typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;
-
-struct ForgeVersion : public BaseVersion
-{
-	virtual QString descriptor() override;
-	virtual QString name() override;
-	virtual QString typeString() const override;
-	virtual bool operator<(BaseVersion &a) override;
-	virtual bool operator>(BaseVersion &a) override;
-
-	QString filename();
-	QString url();
-	
-	enum
-	{
-		Invalid,
-		Legacy,
-		Gradle
-	} type = Invalid;
-	
-	bool usesInstaller();
-
-	int m_buildnr = 0;
-	QString branch;
-	QString universal_url;
-	QString changelog_url;
-	QString installer_url;
-	QString jobbuildver;
-	QString mcver;
-	QString mcver_sane;
-	QString universal_filename;
-	QString installer_filename;
-	bool is_recommended = false;
-};
-
-Q_DECLARE_METATYPE(ForgeVersionPtr)
diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.cpp b/libraries/logic/minecraft/forge/ForgeVersionList.cpp
deleted file mode 100644
index de185e5f..00000000
--- a/libraries/logic/minecraft/forge/ForgeVersionList.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ForgeVersionList.h"
-#include "ForgeVersion.h"
-
-#include "net/NetJob.h"
-#include "net/URLConstants.h"
-#include "Env.h"
-
-#include <QtNetwork>
-#include <QtXml>
-#include <QRegExp>
-
-#include <QDebug>
-
-ForgeVersionList::ForgeVersionList(QObject *parent) : BaseVersionList(parent)
-{
-}
-
-Task *ForgeVersionList::getLoadTask()
-{
-	return new ForgeListLoadTask(this);
-}
-
-bool ForgeVersionList::isLoaded()
-{
-	return m_loaded;
-}
-
-const BaseVersionPtr ForgeVersionList::at(int i) const
-{
-	return m_vlist.at(i);
-}
-
-int ForgeVersionList::count() const
-{
-	return m_vlist.count();
-}
-
-int ForgeVersionList::columnCount(const QModelIndex &parent) const
-{
-	return 1;
-}
-
-QVariant ForgeVersionList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	auto version = std::dynamic_pointer_cast<ForgeVersion>(m_vlist[index.row()]);
-	switch (role)
-	{
-	case VersionPointerRole:
-		return qVariantFromValue(m_vlist[index.row()]);
-
-	case VersionRole:
-		return version->name();
-
-	case VersionIdRole:
-		return version->descriptor();
-
-	case ParentGameVersionRole:
-		return version->mcver_sane;
-
-	case RecommendedRole:
-		return version->is_recommended;
-
-	case BranchRole:
-		return version->branch;
-
-	default:
-		return QVariant();
-	}
-}
-
-BaseVersionList::RoleList ForgeVersionList::providesRoles() const
-{
-	return {VersionPointerRole, VersionRole, VersionIdRole, ParentGameVersionRole, RecommendedRole, BranchRole};
-}
-
-BaseVersionPtr ForgeVersionList::getLatestStable() const
-{
-	return BaseVersionPtr();
-}
-
-void ForgeVersionList::updateListData(QList<BaseVersionPtr> versions)
-{
-	beginResetModel();
-	m_vlist = versions;
-	m_loaded = true;
-	endResetModel();
-	// NOW SORT!!
-	// sort();
-}
-
-void ForgeVersionList::sortVersions()
-{
-	// NO-OP for now
-}
-
-ForgeListLoadTask::ForgeListLoadTask(ForgeVersionList *vlist) : Task()
-{
-	m_list = vlist;
-}
-
-void ForgeListLoadTask::executeTask()
-{
-	setStatus(tr("Fetching Forge version lists..."));
-	auto job = new NetJob("Version index");
-	// we do not care if the version is stale or not.
-	auto forgeListEntry = ENV.metacache()->resolveEntry("minecraftforge", "list.json");
-	auto gradleForgeListEntry = ENV.metacache()->resolveEntry("minecraftforge", "json");
-
-	// verify by poking the server.
-	forgeListEntry->setStale(true);
-	gradleForgeListEntry->setStale(true);
-
-	job->addNetAction(listDownload = CacheDownload::make(QUrl(URLConstants::FORGE_LEGACY_URL),
-														 forgeListEntry));
-	job->addNetAction(gradleListDownload = CacheDownload::make(
-						  QUrl(URLConstants::FORGE_GRADLE_URL), gradleForgeListEntry));
-
-	connect(listDownload.get(), SIGNAL(failed(int)), SLOT(listFailed()));
-	connect(gradleListDownload.get(), SIGNAL(failed(int)), SLOT(gradleListFailed()));
-
-	listJob.reset(job);
-	connect(listJob.get(), SIGNAL(succeeded()), SLOT(listDownloaded()));
-	connect(listJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	listJob->start();
-}
-
-bool ForgeListLoadTask::abort()
-{
-	return listJob->abort();
-}
-
-bool ForgeListLoadTask::parseForgeList(QList<BaseVersionPtr> &out)
-{
-	QByteArray data;
-	{
-		auto dlJob = listDownload;
-		auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
-		QFile listFile(filename);
-		if (!listFile.open(QIODevice::ReadOnly))
-		{
-			return false;
-		}
-		data = listFile.readAll();
-		dlJob.reset();
-	}
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		emitFailed("Error parsing version list JSON:" + jsonError.errorString());
-		return false;
-	}
-
-	if (!jsonDoc.isObject())
-	{
-		emitFailed("Error parsing version list JSON: JSON root is not an object");
-		return false;
-	}
-
-	QJsonObject root = jsonDoc.object();
-
-	// Now, get the array of versions.
-	if (!root.value("builds").isArray())
-	{
-		emitFailed(
-			"Error parsing version list JSON: version list object is missing 'builds' array");
-		return false;
-	}
-	QJsonArray builds = root.value("builds").toArray();
-
-	for (int i = 0; i < builds.count(); i++)
-	{
-		// Load the version info.
-		if (!builds[i].isObject())
-		{
-			// FIXME: log this somewhere
-			continue;
-		}
-		QJsonObject obj = builds[i].toObject();
-		int build_nr = obj.value("build").toDouble(0);
-		if (!build_nr)
-			continue;
-		QJsonArray files = obj.value("files").toArray();
-		QString url, jobbuildver, mcver, buildtype, universal_filename;
-		QString changelog_url, installer_url;
-		QString installer_filename;
-		bool valid = false;
-		for (int j = 0; j < files.count(); j++)
-		{
-			if (!files[j].isObject())
-			{
-				continue;
-			}
-			QJsonObject file = files[j].toObject();
-			buildtype = file.value("buildtype").toString();
-			if ((buildtype == "client" || buildtype == "universal") && !valid)
-			{
-				mcver = file.value("mcver").toString();
-				url = file.value("url").toString();
-				jobbuildver = file.value("jobbuildver").toString();
-				int lastSlash = url.lastIndexOf('/');
-				universal_filename = url.mid(lastSlash + 1);
-				valid = true;
-			}
-			else if (buildtype == "changelog")
-			{
-				QString ext = file.value("ext").toString();
-				if (ext.isEmpty())
-				{
-					continue;
-				}
-				changelog_url = file.value("url").toString();
-			}
-			else if (buildtype == "installer")
-			{
-				installer_url = file.value("url").toString();
-				int lastSlash = installer_url.lastIndexOf('/');
-				installer_filename = installer_url.mid(lastSlash + 1);
-			}
-		}
-		if (valid)
-		{
-			// Now, we construct the version object and add it to the list.
-			std::shared_ptr<ForgeVersion> fVersion(new ForgeVersion());
-			fVersion->universal_url = url;
-			fVersion->changelog_url = changelog_url;
-			fVersion->installer_url = installer_url;
-			fVersion->jobbuildver = jobbuildver;
-			fVersion->mcver = fVersion->mcver_sane = mcver;
-			fVersion->installer_filename = installer_filename;
-			fVersion->universal_filename = universal_filename;
-			fVersion->m_buildnr = build_nr;
-			fVersion->type = ForgeVersion::Legacy;
-			out.append(fVersion);
-		}
-	}
-
-	return true;
-}
-
-bool ForgeListLoadTask::parseForgeGradleList(QList<BaseVersionPtr> &out)
-{
-	QMap<int, std::shared_ptr<ForgeVersion>> lookup;
-	QByteArray data;
-	{
-		auto dlJob = gradleListDownload;
-		auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
-		QFile listFile(filename);
-		if (!listFile.open(QIODevice::ReadOnly))
-		{
-			return false;
-		}
-		data = listFile.readAll();
-		dlJob.reset();
-	}
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		emitFailed("Error parsing gradle version list JSON:" + jsonError.errorString());
-		return false;
-	}
-
-	if (!jsonDoc.isObject())
-	{
-		emitFailed("Error parsing gradle version list JSON: JSON root is not an object");
-		return false;
-	}
-
-	QJsonObject root = jsonDoc.object();
-
-	// we probably could hard code these, but it might still be worth doing it this way
-	const QString webpath = root.value("webpath").toString();
-	const QString artifact = root.value("artifact").toString();
-
-	QJsonObject numbers = root.value("number").toObject();
-	for (auto it = numbers.begin(); it != numbers.end(); ++it)
-	{
-		QJsonObject number = it.value().toObject();
-		std::shared_ptr<ForgeVersion> fVersion(new ForgeVersion());
-		fVersion->m_buildnr = number.value("build").toDouble();
-		if(fVersion->m_buildnr >= 953 && fVersion->m_buildnr <= 965)
-		{
-			qDebug() << fVersion->m_buildnr;
-		}
-		fVersion->jobbuildver = number.value("version").toString();
-		fVersion->branch = number.value("branch").toString("");
-		fVersion->mcver = number.value("mcversion").toString();
-		fVersion->universal_filename = "";
-		fVersion->installer_filename = "";
-		// HACK: here, we fix the minecraft version used by forge.
-		// HACK: this will inevitably break (later)
-		// FIXME: replace with a dictionary
-		fVersion->mcver_sane = fVersion->mcver;
-		fVersion->mcver_sane.replace("_pre", "-pre");
-
-		QString universal_filename, installer_filename;
-		QJsonArray files = number.value("files").toArray();
-		for (auto fIt = files.begin(); fIt != files.end(); ++fIt)
-		{
-			// TODO with gradle we also get checksums, use them
-			QJsonArray file = (*fIt).toArray();
-			if (file.size() < 3)
-			{
-				continue;
-			}
-
-			QString extension = file.at(0).toString();
-			QString part = file.at(1).toString();
-			QString checksum = file.at(2).toString();
-
-			// insane form of mcver is used here
-			QString longVersion = fVersion->mcver + "-" + fVersion->jobbuildver;
-			if (!fVersion->branch.isEmpty())
-			{
-				longVersion = longVersion + "-" + fVersion->branch;
-			}
-			QString filename = artifact + "-" + longVersion + "-" + part + "." + extension;
-
-			QString url = QString("%1/%2/%3")
-							  .arg(webpath)
-							  .arg(longVersion)
-							  .arg(filename);
-
-			if (part == "installer")
-			{
-				fVersion->installer_url = url;
-				installer_filename = filename;
-			}
-			else if (part == "universal")
-			{
-				fVersion->universal_url = url;
-				universal_filename = filename;
-			}
-			else if (part == "changelog")
-			{
-				fVersion->changelog_url = url;
-			}
-		}
-		if (fVersion->installer_url.isEmpty() && fVersion->universal_url.isEmpty())
-		{
-			continue;
-		}
-		fVersion->universal_filename = universal_filename;
-		fVersion->installer_filename = installer_filename;
-		fVersion->type = ForgeVersion::Gradle;
-		out.append(fVersion);
-		lookup[fVersion->m_buildnr] = fVersion;
-	}
-	QJsonObject promos = root.value("promos").toObject();
-	for (auto it = promos.begin(); it != promos.end(); ++it)
-	{
-		QString key = it.key();
-		int build = it.value().toInt();
-		QRegularExpression regexp("^(?<mcversion>[0-9]+(.[0-9]+)*)-(?<label>[a-z]+)$");
-		auto match = regexp.match(key);
-		if(!match.hasMatch())
-		{
-			qDebug() << key << "doesn't match." << "build" << build;
-			continue;
-		}
-
-		QString label = match.captured("label");
-		if(label != "recommended")
-		{
-			continue;
-		}
-		QString mcversion = match.captured("mcversion");
-		qDebug() << "Forge build" << build << "is the" << label << "for Minecraft" << mcversion << QString("<%1>").arg(key);
-		lookup[build]->is_recommended = true;
-	}
-	return true;
-}
-
-void ForgeListLoadTask::listDownloaded()
-{
-	QList<BaseVersionPtr> list;
-	bool ret = true;
-	if (!parseForgeList(list))
-	{
-		ret = false;
-	}
-	if (!parseForgeGradleList(list))
-	{
-		ret = false;
-	}
-
-	if (!ret)
-	{
-		return;
-	}
-	std::sort(list.begin(), list.end(), [](const BaseVersionPtr & l, const BaseVersionPtr & r)
-	{ return (*l > *r); });
-
-	m_list->updateListData(list);
-
-	emitSucceeded();
-	return;
-}
-
-void ForgeListLoadTask::listFailed()
-{
-	auto &reply = listDownload->m_reply;
-	if (reply)
-	{
-		qCritical() << "Getting forge version list failed: " << reply->errorString();
-	}
-	else
-	{
-		qCritical() << "Getting forge version list failed for reasons unknown.";
-	}
-}
-
-void ForgeListLoadTask::gradleListFailed()
-{
-	auto &reply = gradleListDownload->m_reply;
-	if (reply)
-	{
-		qCritical() << "Getting forge version list failed: " << reply->errorString();
-	}
-	else
-	{
-		qCritical() << "Getting forge version list failed for reasons unknown.";
-	}
-}
diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.h b/libraries/logic/minecraft/forge/ForgeVersionList.h
deleted file mode 100644
index 62c08b2a..00000000
--- a/libraries/logic/minecraft/forge/ForgeVersionList.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "ForgeVersion.h"
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QUrl>
-#include <QNetworkReply>
-
-#include "BaseVersionList.h"
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT ForgeVersionList : public BaseVersionList
-{
-	Q_OBJECT
-public:
-	friend class ForgeListLoadTask;
-
-	explicit ForgeVersionList(QObject *parent = 0);
-
-	virtual Task *getLoadTask() override;
-	virtual bool isLoaded() override;
-	virtual const BaseVersionPtr at(int i) const override;
-	virtual int count() const override;
-	virtual void sortVersions() override;
-
-	virtual BaseVersionPtr getLatestStable() const override;
-
-	ForgeVersionPtr findVersionByVersionNr(QString version);
-
-	virtual QVariant data(const QModelIndex &index, int role) const override;
-	virtual RoleList providesRoles() const override;
-
-	virtual int columnCount(const QModelIndex &parent) const override;
-
-protected:
-	QList<BaseVersionPtr> m_vlist;
-
-	bool m_loaded = false;
-
-protected
-slots:
-	virtual void updateListData(QList<BaseVersionPtr> versions) override;
-};
-
-class ForgeListLoadTask : public Task
-{
-	Q_OBJECT
-
-public:
-	explicit ForgeListLoadTask(ForgeVersionList *vlist);
-
-	virtual void executeTask();
-	virtual bool abort();
-
-protected
-slots:
-	void listDownloaded();
-	void listFailed();
-	void gradleListFailed();
-
-protected:
-	NetJobPtr listJob;
-	ForgeVersionList *m_list;
-
-	CacheDownloadPtr listDownload;
-	CacheDownloadPtr gradleListDownload;
-
-private:
-	bool parseForgeList(QList<BaseVersionPtr> &out);
-	bool parseForgeGradleList(QList<BaseVersionPtr> &out);
-};
diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.cpp b/libraries/logic/minecraft/forge/ForgeXzDownload.cpp
deleted file mode 100644
index adf96552..00000000
--- a/libraries/logic/minecraft/forge/ForgeXzDownload.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Env.h"
-#include "ForgeXzDownload.h"
-#include <FileSystem.h>
-
-#include <QCryptographicHash>
-#include <QFileInfo>
-#include <QDateTime>
-#include <QDir>
-#include <QDebug>
-
-ForgeXzDownload::ForgeXzDownload(QString relative_path, MetaEntryPtr entry) : NetAction()
-{
-	m_entry = entry;
-	m_target_path = entry->getFullPath();
-	m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX");
-	m_status = Job_NotStarted;
-	m_url_path = relative_path;
-	m_url = "http://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz";
-}
-
-void ForgeXzDownload::start()
-{
-	m_status = Job_InProgress;
-	if (!m_entry->isStale())
-	{
-		m_status = Job_Finished;
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	// can we actually create the real, final file?
-	if (!FS::ensureFilePathExists(m_target_path))
-	{
-		m_status = Job_Failed;
-		emit failed(m_index_within_job);
-		return;
-	}
-
-	qDebug() << "Downloading " << m_url.toString();
-	QNetworkRequest request(m_url);
-	request.setRawHeader(QString("If-None-Match").toLatin1(), m_entry->getETag().toLatin1());
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Cached)");
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->get(request);
-
-	m_reply.reset(rep);
-	connect(rep, SIGNAL(downloadProgress(qint64, qint64)),
-			SLOT(downloadProgress(qint64, qint64)));
-	connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
-}
-
-void ForgeXzDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
-
-void ForgeXzDownload::downloadError(QNetworkReply::NetworkError error)
-{
-	// error happened during download.
-	// TODO: log the reason why
-	m_status = Job_Failed;
-}
-
-void ForgeXzDownload::failAndTryNextMirror()
-{
-	m_status = Job_Failed;
-	emit failed(m_index_within_job);
-}
-
-void ForgeXzDownload::downloadFinished()
-{
-	// if the download succeeded
-	if (m_status != Job_Failed)
-	{
-		// nothing went wrong...
-		m_status = Job_Finished;
-		if (m_pack200_xz_file.isOpen())
-		{
-			// we actually downloaded something! process and isntall it
-			decompressAndInstall();
-			return;
-		}
-		else
-		{
-			// something bad happened -- on the local machine!
-			m_status = Job_Failed;
-			m_pack200_xz_file.remove();
-			m_reply.reset();
-			emit failed(m_index_within_job);
-			return;
-		}
-	}
-	// else the download failed
-	else
-	{
-		m_status = Job_Failed;
-		m_pack200_xz_file.close();
-		m_pack200_xz_file.remove();
-		m_reply.reset();
-		failAndTryNextMirror();
-		return;
-	}
-}
-
-void ForgeXzDownload::downloadReadyRead()
-{
-
-	if (!m_pack200_xz_file.isOpen())
-	{
-		if (!m_pack200_xz_file.open())
-		{
-			/*
-			* Can't open the file... the job failed
-			*/
-			m_reply->abort();
-			emit failed(m_index_within_job);
-			return;
-		}
-	}
-	m_pack200_xz_file.write(m_reply->readAll());
-}
-
-#include "xz.h"
-#include "unpack200.h"
-#include <stdexcept>
-#include <unistd.h>
-
-const size_t buffer_size = 8196;
-
-void ForgeXzDownload::decompressAndInstall()
-{
-	// rewind the downloaded temp file
-	m_pack200_xz_file.seek(0);
-	// de-xz'd file
-	QTemporaryFile pack200_file("./dl_temp.XXXXXX");
-	pack200_file.open();
-
-	bool xz_success = false;
-	// first, de-xz
-	{
-		uint8_t in[buffer_size];
-		uint8_t out[buffer_size];
-		struct xz_buf b;
-		struct xz_dec *s;
-		enum xz_ret ret;
-		xz_crc32_init();
-		xz_crc64_init();
-		s = xz_dec_init(XZ_DYNALLOC, 1 << 26);
-		if (s == nullptr)
-		{
-			xz_dec_end(s);
-			failAndTryNextMirror();
-			return;
-		}
-		b.in = in;
-		b.in_pos = 0;
-		b.in_size = 0;
-		b.out = out;
-		b.out_pos = 0;
-		b.out_size = buffer_size;
-		while (!xz_success)
-		{
-			if (b.in_pos == b.in_size)
-			{
-				b.in_size = m_pack200_xz_file.read((char *)in, sizeof(in));
-				b.in_pos = 0;
-			}
-
-			ret = xz_dec_run(s, &b);
-
-			if (b.out_pos == sizeof(out))
-			{
-				if (pack200_file.write((char *)out, b.out_pos) != b.out_pos)
-				{
-					// msg = "Write error\n";
-					xz_dec_end(s);
-					failAndTryNextMirror();
-					return;
-				}
-
-				b.out_pos = 0;
-			}
-
-			if (ret == XZ_OK)
-				continue;
-
-			if (ret == XZ_UNSUPPORTED_CHECK)
-			{
-				// unsupported check. this is OK, but we should log this
-				continue;
-			}
-
-			if (pack200_file.write((char *)out, b.out_pos) != b.out_pos)
-			{
-				// write error
-				pack200_file.close();
-				xz_dec_end(s);
-				return;
-			}
-
-			switch (ret)
-			{
-			case XZ_STREAM_END:
-				xz_dec_end(s);
-				xz_success = true;
-				break;
-
-			case XZ_MEM_ERROR:
-				qCritical() << "Memory allocation failed\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-
-			case XZ_MEMLIMIT_ERROR:
-				qCritical() << "Memory usage limit reached\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-
-			case XZ_FORMAT_ERROR:
-				qCritical() << "Not a .xz file\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-
-			case XZ_OPTIONS_ERROR:
-				qCritical() << "Unsupported options in the .xz headers\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-
-			case XZ_DATA_ERROR:
-			case XZ_BUF_ERROR:
-				qCritical() << "File is corrupt\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-
-			default:
-				qCritical() << "Bug!\n";
-				xz_dec_end(s);
-				failAndTryNextMirror();
-				return;
-			}
-		}
-	}
-	m_pack200_xz_file.remove();
-
-	// revert pack200
-	pack200_file.seek(0);
-	int handle_in = pack200_file.handle();
-	// FIXME: dispose of file handles, pointers and the like. Ideally wrap in objects.
-	if(handle_in == -1)
-	{
-		qCritical() << "Error reopening " << pack200_file.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	int handle_in_dup = dup (handle_in);
-	if(handle_in_dup == -1)
-	{
-		qCritical() << "Error reopening " << pack200_file.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	FILE *file_in = fdopen (handle_in_dup, "rb");
-	if(!file_in)
-	{
-		qCritical() << "Error reopening " << pack200_file.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	QFile qfile_out(m_target_path);
-	if(!qfile_out.open(QIODevice::WriteOnly))
-	{
-		qCritical() << "Error opening " << qfile_out.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	int handle_out = qfile_out.handle();
-	if(handle_out == -1)
-	{
-		qCritical() << "Error opening " << qfile_out.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	int handle_out_dup = dup (handle_out);
-	if(handle_out_dup == -1)
-	{
-		qCritical() << "Error reopening " << qfile_out.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	FILE *file_out = fdopen (handle_out_dup, "wb");
-	if(!file_out)
-	{
-		qCritical() << "Error opening " << qfile_out.fileName();
-		failAndTryNextMirror();
-		return;
-	}
-	try
-	{
-		// NOTE: this takes ownership of both FILE pointers. That's why we duplicate them above.
-		unpack_200(file_in, file_out);
-	}
-	catch (std::runtime_error &err)
-	{
-		m_status = Job_Failed;
-		qCritical() << "Error unpacking " << pack200_file.fileName() << " : " << err.what();
-		QFile f(m_target_path);
-		if (f.exists())
-			f.remove();
-		failAndTryNextMirror();
-		return;
-	}
-	pack200_file.remove();
-
-	QFile jar_file(m_target_path);
-
-	if (!jar_file.open(QIODevice::ReadOnly))
-	{
-		jar_file.remove();
-		failAndTryNextMirror();
-		return;
-	}
-	auto hash = QCryptographicHash::hash(jar_file.readAll(), QCryptographicHash::Md5);
-	m_entry->setMD5Sum(hash.toHex().constData());
-	jar_file.close();
-
-	QFileInfo output_file_info(m_target_path);
-	m_entry->setETag(m_reply->rawHeader("ETag").constData());
-	m_entry->setLocalChangedTimestamp(output_file_info.lastModified().toUTC().toMSecsSinceEpoch());
-	m_entry->setStale(false);
-	ENV.metacache()->updateEntry(m_entry);
-
-	m_reply.reset();
-	emit succeeded(m_index_within_job);
-}
diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.h b/libraries/logic/minecraft/forge/ForgeXzDownload.h
deleted file mode 100644
index 67524405..00000000
--- a/libraries/logic/minecraft/forge/ForgeXzDownload.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "net/NetAction.h"
-#include "net/HttpMetaCache.h"
-#include <QFile>
-#include <QTemporaryFile>
-
-typedef std::shared_ptr<class ForgeXzDownload> ForgeXzDownloadPtr;
-
-class ForgeXzDownload : public NetAction
-{
-	Q_OBJECT
-public:
-	MetaEntryPtr m_entry;
-	/// if saving to file, use the one specified in this string
-	QString m_target_path;
-	/// this is the output file, if any
-	QTemporaryFile m_pack200_xz_file;
-	/// path relative to the mirror base
-	QString m_url_path;
-
-public:
-	explicit ForgeXzDownload(QString relative_path, MetaEntryPtr entry);
-	static ForgeXzDownloadPtr make(QString relative_path, MetaEntryPtr entry)
-	{
-		return ForgeXzDownloadPtr(new ForgeXzDownload(relative_path, entry));
-	}
-	virtual ~ForgeXzDownload(){};
-
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	virtual void downloadError(QNetworkReply::NetworkError error);
-	virtual void downloadFinished();
-	virtual void downloadReadyRead();
-
-public
-slots:
-	virtual void start();
-
-private:
-	void decompressAndInstall();
-	void failAndTryNextMirror();
-};
diff --git a/libraries/logic/minecraft/forge/LegacyForge.cpp b/libraries/logic/minecraft/forge/LegacyForge.cpp
deleted file mode 100644
index aa2c8063..00000000
--- a/libraries/logic/minecraft/forge/LegacyForge.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LegacyForge.h"
-
-MinecraftForge::MinecraftForge(const QString &file) : Mod(file)
-{
-}
-
-bool MinecraftForge::FixVersionIfNeeded(QString newVersion)
-{/*
-	wxString reportedVersion = GetModVersion();
-	if(reportedVersion == "..." || reportedVersion.empty())
-	{
-		std::auto_ptr<wxFFileInputStream> in(new wxFFileInputStream("forge.zip"));
-		wxTempFileOutputStream out("forge.zip");
-		wxTextOutputStream textout(out);
-		wxZipInputStream inzip(*in);
-		wxZipOutputStream outzip(out);
-		std::auto_ptr<wxZipEntry> entry;
-		// preserve metadata
-		outzip.CopyArchiveMetaData(inzip);
-		// copy all entries
-		while (entry.reset(inzip.GetNextEntry()), entry.get() != NULL)
-			if (!outzip.CopyEntry(entry.release(), inzip))
-				return false;
-		// release last entry
-		in.reset();
-		outzip.PutNextEntry("forgeversion.properties");
-
-		wxStringTokenizer tokenizer(newVersion,".");
-		wxString verFile;
-		verFile << wxString("forge.major.number=") << tokenizer.GetNextToken() << "\n";
-		verFile << wxString("forge.minor.number=") << tokenizer.GetNextToken() << "\n";
-		verFile << wxString("forge.revision.number=") << tokenizer.GetNextToken() << "\n";
-		verFile << wxString("forge.build.number=") << tokenizer.GetNextToken() << "\n";
-		auto buf = verFile.ToUTF8();
-		outzip.Write(buf.data(), buf.length());
-		// check if we succeeded
-		return inzip.Eof() && outzip.Close() && out.Commit();
-	}
-	*/
-	return true;
-}
diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.cpp b/libraries/logic/minecraft/ftb/FTBPlugin.cpp
deleted file mode 100644
index a142c106..00000000
--- a/libraries/logic/minecraft/ftb/FTBPlugin.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-#include "FTBPlugin.h"
-#include <Env.h>
-#include "FTBVersion.h"
-#include "LegacyFTBInstance.h"
-#include "OneSixFTBInstance.h"
-#include <BaseInstance.h>
-#include <InstanceList.h>
-#include <minecraft/MinecraftVersionList.h>
-#include <settings/INISettingsObject.h>
-#include <FileSystem.h>
-#include "QDebug"
-#include <QXmlStreamReader>
-#include <QRegularExpression>
-
-struct FTBRecord
-{
-	QString dirName;
-	QString name;
-	QString logo;
-	QString iconKey;
-	QString mcVersion;
-	QString description;
-	QString instanceDir;
-	QString templateDir;
-	bool operator==(const FTBRecord other) const
-	{
-		return instanceDir == other.instanceDir;
-	}
-};
-
-inline uint qHash(FTBRecord record)
-{
-	return qHash(record.instanceDir);
-}
-
-QSet<FTBRecord> discoverFTBInstances(SettingsObjectPtr globalSettings)
-{
-	QSet<FTBRecord> records;
-	QDir dir = QDir(globalSettings->get("FTBLauncherLocal").toString());
-	QDir dataDir = QDir(globalSettings->get("FTBRoot").toString());
-	if (!dataDir.exists())
-	{
-		qDebug() << "The FTB directory specified does not exist. Please check your settings";
-		return records;
-	}
-	else if (!dir.exists())
-	{
-		qDebug() << "The FTB launcher data directory specified does not exist. Please check "
-					"your settings";
-		return records;
-	}
-	dir.cd("ModPacks");
-	auto allFiles = dir.entryList(QDir::Readable | QDir::Files, QDir::Name);
-	for (auto filename : allFiles)
-	{
-		if (!filename.endsWith(".xml"))
-			continue;
-		auto fpath = dir.absoluteFilePath(filename);
-		QFile f(fpath);
-		qDebug() << "Discovering FTB instances -- " << fpath;
-		if (!f.open(QFile::ReadOnly))
-			continue;
-
-		// read the FTB packs XML.
-		QXmlStreamReader reader(&f);
-		while (!reader.atEnd())
-		{
-			switch (reader.readNext())
-			{
-			case QXmlStreamReader::StartElement:
-			{
-				if (reader.name() == "modpack")
-				{
-					QXmlStreamAttributes attrs = reader.attributes();
-					FTBRecord record;
-					record.dirName = attrs.value("dir").toString();
-					record.instanceDir = dataDir.absoluteFilePath(record.dirName);
-					record.templateDir = dir.absoluteFilePath(record.dirName);
-					QDir test(record.instanceDir);
-					qDebug() << dataDir.absolutePath() << record.instanceDir << record.dirName;
-					if (!test.exists())
-						continue;
-					record.name = attrs.value("name").toString();
-					record.logo = attrs.value("logo").toString();
-					QString logo = record.logo;
-					record.iconKey = logo.remove(QRegularExpression("\\..*"));
-					auto customVersions = attrs.value("customMCVersions");
-					if (!customVersions.isNull())
-					{
-						QMap<QString, QString> versionMatcher;
-						QString customVersionsStr = customVersions.toString();
-						QStringList list = customVersionsStr.split(';');
-						for (auto item : list)
-						{
-							auto segment = item.split('^');
-							if (segment.size() != 2)
-							{
-								qCritical() << "FTB: Segment of size < 2 in "
-											<< customVersionsStr;
-								continue;
-							}
-							versionMatcher[segment[0]] = segment[1];
-						}
-						auto actualVersion = attrs.value("version").toString();
-						if (versionMatcher.contains(actualVersion))
-						{
-							record.mcVersion = versionMatcher[actualVersion];
-						}
-						else
-						{
-							record.mcVersion = attrs.value("mcVersion").toString();
-						}
-					}
-					else
-					{
-						record.mcVersion = attrs.value("mcVersion").toString();
-					}
-					record.description = attrs.value("description").toString();
-					records.insert(record);
-				}
-				break;
-			}
-			case QXmlStreamReader::EndElement:
-				break;
-			case QXmlStreamReader::Characters:
-				break;
-			default:
-				break;
-			}
-		}
-		f.close();
-	}
-	return records;
-}
-
-InstancePtr loadInstance(SettingsObjectPtr globalSettings, QMap<QString, QString> &groupMap, const FTBRecord & record)
-{
-	InstancePtr inst;
-
-	auto m_settings = std::make_shared<INISettingsObject>(FS::PathCombine(record.instanceDir, "instance.cfg"));
-	m_settings->registerSetting("InstanceType", "Legacy");
-
-	qDebug() << "Loading existing " << record.name;
-
-	QString inst_type = m_settings->get("InstanceType").toString();
-	if (inst_type == "LegacyFTB")
-	{
-		inst.reset(new LegacyFTBInstance(globalSettings, m_settings, record.instanceDir));
-	}
-	else if (inst_type == "OneSixFTB")
-	{
-		inst.reset(new OneSixFTBInstance(globalSettings, m_settings, record.instanceDir));
-	}
-	else
-	{
-		return nullptr;
-	}
-	qDebug() << "Construction " << record.instanceDir;
-
-	SettingsObject::Lock lock(inst->settings());
-	inst->init();
-	qDebug() << "Init " << record.instanceDir;
-	inst->setGroupInitial("FTB");
-	/**
-	 * FIXME: this does not respect the user's preferences. BUT, it would work nicely with the planned pack support
-	 *        -> instead of changing the user values, change pack values (defaults you can look at and revert to)
-	 */
-	/*
-	inst->setName(record.name);
-	inst->setIconKey(record.iconKey);
-	inst->setNotes(record.description);
-	*/
-	if (inst->intendedVersionId() != record.mcVersion)
-	{
-		inst->setIntendedVersionId(record.mcVersion);
-	}
-	qDebug() << "Post-Process " << record.instanceDir;
-	if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
-	{
-		return nullptr;
-	}
-	qDebug() << "Final " << record.instanceDir;
-	return inst;
-}
-
-InstancePtr createInstance(SettingsObjectPtr globalSettings, QMap<QString, QString> &groupMap, const FTBRecord & record)
-{
-	QDir rootDir(record.instanceDir);
-
-	InstancePtr inst;
-
-	qDebug() << "Converting " << record.name << " as new.";
-
-	auto mcVersion = std::dynamic_pointer_cast<MinecraftVersion>(ENV.getVersion("net.minecraft", record.mcVersion));
-	if (!mcVersion)
-	{
-		qCritical() << "Can't load instance " << record.instanceDir
-					<< " because minecraft version " << record.mcVersion
-					<< " can't be resolved.";
-		return nullptr;
-	}
-
-	if (!rootDir.exists() && !rootDir.mkpath("."))
-	{
-		qCritical() << "Can't create instance folder" << record.instanceDir;
-		return nullptr;
-	}
-
-	auto m_settings = std::make_shared<INISettingsObject>(FS::PathCombine(record.instanceDir, "instance.cfg"));
-	m_settings->registerSetting("InstanceType", "Legacy");
-
-	if (mcVersion->usesLegacyLauncher())
-	{
-		m_settings->set("InstanceType", "LegacyFTB");
-		inst.reset(new LegacyFTBInstance(globalSettings, m_settings, record.instanceDir));
-	}
-	else
-	{
-		m_settings->set("InstanceType", "OneSixFTB");
-		inst.reset(new OneSixFTBInstance(globalSettings, m_settings, record.instanceDir));
-	}
-	// initialize
-	{
-		SettingsObject::Lock lock(inst->settings());
-		inst->setIntendedVersionId(mcVersion->descriptor());
-		inst->init();
-		inst->setGroupInitial("FTB");
-		inst->setName(record.name);
-		inst->setIconKey(record.iconKey);
-		inst->setNotes(record.description);
-		qDebug() << "Post-Process " << record.instanceDir;
-		if (!InstanceList::continueProcessInstance(inst, InstanceList::NoCreateError, record.instanceDir, groupMap))
-		{
-			return nullptr;
-		}
-	}
-	return inst;
-}
-
-void FTBPlugin::loadInstances(SettingsObjectPtr globalSettings, QMap<QString, QString> &groupMap, QList<InstancePtr> &tempList)
-{
-	// nothing to load when we don't have
-	if (globalSettings->get("TrackFTBInstances").toBool() != true)
-	{
-		return;
-	}
-
-	auto records = discoverFTBInstances(globalSettings);
-	if (!records.size())
-	{
-		qDebug() << "No FTB instances to load.";
-		return;
-	}
-	qDebug() << "Loading FTB instances! -- got " << records.size();
-	// process the records we acquired.
-	for (auto record : records)
-	{
-		qDebug() << "Loading FTB instance from " << record.instanceDir;
-		QString iconKey = record.iconKey;
-		// MMC->icons()->addIcon(iconKey, iconKey, FS::PathCombine(record.templateDir, record.logo), MMCIcon::Transient);
-		auto settingsFilePath = FS::PathCombine(record.instanceDir, "instance.cfg");
-		qDebug() << "ICON get!";
-
-		if (QFileInfo(settingsFilePath).exists())
-		{
-			auto instPtr = loadInstance(globalSettings, groupMap, record);
-			if (!instPtr)
-			{
-				qWarning() << "Couldn't load instance config:" << settingsFilePath;
-				if(!QFile::remove(settingsFilePath))
-				{
-					qWarning() << "Couldn't remove broken instance config!";
-					continue;
-				}
-				// failed to load, but removed the poisonous file
-			}
-			else
-			{
-				tempList.append(InstancePtr(instPtr));
-				continue;
-			}
-		}
-		auto instPtr = createInstance(globalSettings, groupMap, record);
-		if (!instPtr)
-		{
-			qWarning() << "Couldn't create FTB instance!";
-			continue;
-		}
-		tempList.append(InstancePtr(instPtr));
-	}
-}
-
-#ifdef Q_OS_WIN32
-#include <windows.h>
-static const int APPDATA_BUFFER_SIZE = 1024;
-#endif
-
-static QString getLocalCacheStorageLocation()
-{
-	QString ftbDefault;
-#ifdef Q_OS_WIN32
-	wchar_t buf[APPDATA_BUFFER_SIZE];
-	if (GetEnvironmentVariableW(L"LOCALAPPDATA", buf, APPDATA_BUFFER_SIZE)) // local
-	{
-		ftbDefault = QDir(QString::fromWCharArray(buf)).absoluteFilePath("ftblauncher");
-	}
-	else if (GetEnvironmentVariableW(L"APPDATA", buf, APPDATA_BUFFER_SIZE)) // roaming
-	{
-		ftbDefault = QDir(QString::fromWCharArray(buf)).absoluteFilePath("ftblauncher");
-	}
-	else
-	{
-		qCritical() << "Your LOCALAPPDATA and APPDATA folders are missing!"
-			" If you are on windows, this means your system is broken.";
-	}
-#elif defined(Q_OS_MAC)
-	ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
-#else
-	ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
-#endif
-	return ftbDefault;
-}
-
-
-static QString getRoamingStorageLocation()
-{
-	QString ftbDefault;
-#ifdef Q_OS_WIN32
-	wchar_t buf[APPDATA_BUFFER_SIZE];
-	QString cacheStorage;
-	if (GetEnvironmentVariableW(L"APPDATA", buf, APPDATA_BUFFER_SIZE))
-	{
-		ftbDefault = QDir(QString::fromWCharArray(buf)).absoluteFilePath("ftblauncher");
-	}
-	else
-	{
-		qCritical() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken.";
-	}
-#elif defined(Q_OS_MAC)
-	ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
-#else
-	ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
-#endif
-	return ftbDefault;
-}
-
-void FTBPlugin::initialize(SettingsObjectPtr globalSettings)
-{
-	// FTB
-	globalSettings->registerSetting("TrackFTBInstances", false);
-	QString ftbRoaming = getRoamingStorageLocation();
-	QString ftbLocal = getLocalCacheStorageLocation();
-
-	globalSettings->registerSetting("FTBLauncherRoaming", ftbRoaming);
-	globalSettings->registerSetting("FTBLauncherLocal", ftbLocal);
-	qDebug() << "FTB Launcher paths:" << globalSettings->get("FTBLauncherRoaming").toString()
-			 << "and" << globalSettings->get("FTBLauncherLocal").toString();
-
-	globalSettings->registerSetting("FTBRoot");
-	if (globalSettings->get("FTBRoot").isNull())
-	{
-		QString ftbRoot;
-		QFile f(QDir(globalSettings->get("FTBLauncherRoaming").toString()).absoluteFilePath("ftblaunch.cfg"));
-		qDebug() << "Attempting to read" << f.fileName();
-		if (f.open(QFile::ReadOnly))
-		{
-			const QString data = QString::fromLatin1(f.readAll());
-			QRegularExpression exp("installPath=(.*)");
-			ftbRoot = QDir::cleanPath(exp.match(data).captured(1));
-#ifdef Q_OS_WIN32
-			if (!ftbRoot.isEmpty())
-			{
-				if (ftbRoot.at(0).isLetter() && ftbRoot.size() > 1 && ftbRoot.at(1) == '/')
-				{
-					ftbRoot.remove(1, 1);
-				}
-			}
-#endif
-			if (ftbRoot.isEmpty())
-			{
-				qDebug() << "Failed to get FTB root path";
-			}
-			else
-			{
-				qDebug() << "FTB is installed at" << ftbRoot;
-				globalSettings->set("FTBRoot", ftbRoot);
-			}
-		}
-		else
-		{
-			qWarning() << "Couldn't open" << f.fileName() << ":" << f.errorString();
-			qWarning() << "This is perfectly normal if you don't have FTB installed";
-		}
-	}
-}
diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.h b/libraries/logic/minecraft/ftb/FTBPlugin.h
deleted file mode 100644
index 6851d8a5..00000000
--- a/libraries/logic/minecraft/ftb/FTBPlugin.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <BaseInstance.h>
-
-#include "multimc_logic_export.h"
-
-// Pseudo-plugin for FTB related things. Super derpy!
-class MULTIMC_LOGIC_EXPORT FTBPlugin
-{
-public:
-	static void initialize(SettingsObjectPtr globalSettings);
-	static void loadInstances(SettingsObjectPtr globalSettings, QMap<QString, QString> &groupMap, QList<InstancePtr> &tempList);
-};
diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp b/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp
deleted file mode 100644
index f5faacae..00000000
--- a/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "FTBProfileStrategy.h"
-#include "OneSixFTBInstance.h"
-
-#include "minecraft/VersionBuildError.h"
-#include "minecraft/MinecraftVersionList.h"
-#include <FileSystem.h>
-
-#include <QDir>
-#include <QUuid>
-#include <QJsonDocument>
-#include <QJsonArray>
-
-FTBProfileStrategy::FTBProfileStrategy(OneSixFTBInstance* instance) : OneSixProfileStrategy(instance)
-{
-}
-
-void FTBProfileStrategy::loadDefaultBuiltinPatches()
-{
-	// FIXME: this should be here, but it needs us to be able to deal with multiple libraries paths
-	// OneSixProfileStrategy::loadDefaultBuiltinPatches();
-	auto mcVersion = m_instance->intendedVersionId();
-	auto nativeInstance = dynamic_cast<OneSixFTBInstance *>(m_instance);
-
-	ProfilePatchPtr minecraftPatch;
-	{
-		auto mcJson = m_instance->versionsPath().absoluteFilePath(mcVersion + "/" + mcVersion + ".json");
-		// load up the base minecraft patch
-		if(QFile::exists(mcJson))
-		{
-			auto file = ProfileUtils::parseJsonFile(QFileInfo(mcJson), false);
-			file->fileId = "net.minecraft";
-			file->name = QObject::tr("Minecraft (tracked)");
-			file->setVanilla(true);
-			if(file->version.isEmpty())
-			{
-				file->version = mcVersion;
-			}
-			for(auto addLib: file->libraries)
-			{
-				addLib->setHint("local");
-				addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath());
-			}
-			minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(file);
-		}
-		else
-		{
-			throw VersionIncomplete("net.minecraft");
-		}
-		minecraftPatch->setOrder(-2);
-	}
-	profile->appendPatch(minecraftPatch);
-
-	ProfilePatchPtr packPatch;
-	{
-		auto mcJson = m_instance->minecraftRoot() + "/pack.json";
-		// load up the base minecraft patch
-		if(QFile::exists(mcJson))
-		{
-			auto file = ProfileUtils::parseJsonFile(QFileInfo(mcJson), false);
-
-			// adapt the loaded file - the FTB patch file format is different than ours.
-			file->minecraftVersion.clear();
-			for(auto addLib: file->libraries)
-			{
-				addLib->setHint("local");
-				addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath());
-			}
-			file->fileId = "org.multimc.ftb.pack";
-			file->setVanilla(true);
-			file->name = QObject::tr("%1 (FTB pack)").arg(m_instance->name());
-			if(file->version.isEmpty())
-			{
-				file->version = QObject::tr("Unknown");
-				QFile versionFile (FS::PathCombine(m_instance->instanceRoot(), "version"));
-				if(versionFile.exists())
-				{
-					if(versionFile.open(QIODevice::ReadOnly))
-					{
-						// FIXME: just guessing the encoding/charset here.
-						auto version = QString::fromUtf8(versionFile.readAll());
-						file->version = version;
-					}
-				}
-			}
-			packPatch = std::dynamic_pointer_cast<ProfilePatch>(file);
-		}
-		else
-		{
-			throw VersionIncomplete("org.multimc.ftb.pack");
-		}
-		packPatch->setOrder(1);
-	}
-	profile->appendPatch(packPatch);
-
-}
-
-void FTBProfileStrategy::load()
-{
-	profile->clearPatches();
-
-	loadDefaultBuiltinPatches();
-	loadUserPatches();
-}
-
-bool FTBProfileStrategy::saveOrder(ProfileUtils::PatchOrder order)
-{
-	return false;
-}
-
-bool FTBProfileStrategy::resetOrder()
-{
-	return false;
-}
-
-bool FTBProfileStrategy::installJarMods(QStringList filepaths)
-{
-	return false;
-}
-
-bool FTBProfileStrategy::customizePatch(ProfilePatchPtr patch)
-{
-	return false;
-}
-
-bool FTBProfileStrategy::revertPatch(ProfilePatchPtr patch)
-{
-	return false;
-}
diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.h b/libraries/logic/minecraft/ftb/FTBProfileStrategy.h
deleted file mode 100644
index 522af098..00000000
--- a/libraries/logic/minecraft/ftb/FTBProfileStrategy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include "minecraft/ProfileStrategy.h"
-#include "minecraft/onesix/OneSixProfileStrategy.h"
-
-class OneSixFTBInstance;
-
-class FTBProfileStrategy : public OneSixProfileStrategy
-{
-public:
-	FTBProfileStrategy(OneSixFTBInstance * instance);
-	virtual ~FTBProfileStrategy() {};
-	virtual void load() override;
-	virtual bool resetOrder() override;
-	virtual bool saveOrder(ProfileUtils::PatchOrder order) override;
-	virtual bool installJarMods(QStringList filepaths) override;
-	virtual bool customizePatch (ProfilePatchPtr patch) override;
-	virtual bool revertPatch (ProfilePatchPtr patch) override;
-
-protected:
-	virtual void loadDefaultBuiltinPatches() override;
-};
diff --git a/libraries/logic/minecraft/ftb/FTBVersion.h b/libraries/logic/minecraft/ftb/FTBVersion.h
deleted file mode 100644
index 805319b4..00000000
--- a/libraries/logic/minecraft/ftb/FTBVersion.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-#include <minecraft/MinecraftVersion.h>
-
-class FTBVersion : public BaseVersion
-{
-public:
-	FTBVersion(MinecraftVersionPtr parent) : m_version(parent){};
-
-public:
-	virtual QString descriptor() override
-	{
-		return m_version->descriptor();
-	}
-
-	virtual QString name() override
-	{
-		return m_version->name();
-	}
-
-	virtual QString typeString() const override
-	{
-		return m_version->typeString();
-	}
-
-	MinecraftVersionPtr getMinecraftVersion()
-	{
-		return m_version;
-	}
-
-private:
-	MinecraftVersionPtr m_version;
-};
diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp b/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp
deleted file mode 100644
index a7091f1d..00000000
--- a/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "LegacyFTBInstance.h"
-#include <settings/INISettingsObject.h>
-#include <QDir>
-
-LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
-	LegacyInstance(globalSettings, settings, rootDir)
-{
-}
-
-QString LegacyFTBInstance::id() const
-{
-	return "FTB/" + BaseInstance::id();
-}
-
-void LegacyFTBInstance::copy(const QDir &newDir)
-{
-	// set the target instance to be plain Legacy
-	INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg"));
-	settings_obj.registerSetting("InstanceType", "Legacy");
-	QString inst_type = settings_obj.get("InstanceType").toString();
-	settings_obj.set("InstanceType", "Legacy");
-}
-
-QString LegacyFTBInstance::typeName() const
-{
-	return tr("Legacy FTB");
-}
diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.h b/libraries/logic/minecraft/ftb/LegacyFTBInstance.h
deleted file mode 100644
index 7178bca4..00000000
--- a/libraries/logic/minecraft/ftb/LegacyFTBInstance.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "minecraft/legacy/LegacyInstance.h"
-
-class LegacyFTBInstance : public LegacyInstance
-{
-	Q_OBJECT
-public:
-	explicit LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-	virtual QString id() const;
-	virtual void copy(const QDir &newDir);
-	virtual QString typeName() const;
-	bool canExport() const override
-	{
-		return false;
-	}
-};
diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp b/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp
deleted file mode 100644
index 81e939a1..00000000
--- a/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "OneSixFTBInstance.h"
-#include "FTBProfileStrategy.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/GradleSpecifier.h"
-#include "tasks/SequentialTask.h"
-#include <settings/INISettingsObject.h>
-#include <FileSystem.h>
-
-#include <QJsonArray>
-
-OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
-	OneSixInstance(globalSettings, settings, rootDir)
-{
-	m_globalSettings = globalSettings;
-}
-
-void OneSixFTBInstance::copy(const QDir &newDir)
-{
-	QStringList libraryNames;
-	// create patch file
-	{
-		qDebug()<< "Creating patch file for FTB instance...";
-		QFile f(minecraftRoot() + "/pack.json");
-		if (!f.open(QFile::ReadOnly))
-		{
-			qCritical() << "Couldn't open" << f.fileName() << ":" << f.errorString();
-			return;
-		}
-		QJsonObject root = QJsonDocument::fromJson(f.readAll()).object();
-		QJsonArray libs = root.value("libraries").toArray();
-		QJsonArray outLibs;
-		for (auto lib : libs)
-		{
-			QJsonObject libObj = lib.toObject();
-			libObj.insert("MMC-hint", QString("local"));
-			libObj.insert("insert", QString("prepend"));
-			libraryNames.append(libObj.value("name").toString());
-			outLibs.append(libObj);
-		}
-		root.remove("libraries");
-		root.remove("id");
-
-		// HACK HACK HACK HACK
-		// A workaround for a problem in MultiMC, triggered by a historical problem in FTB,
-		// triggered by Mojang getting their library versions wrong in 1.7.10
-		if(intendedVersionId() == "1.7.10")
-		{
-			auto insert = [&outLibs, &libraryNames](QString name)
-			{
-				QJsonObject libObj;
-				libObj.insert("insert", QString("replace"));
-				libObj.insert("name", name);
-				libraryNames.push_back(name);
-				outLibs.prepend(libObj);
-			};
-			insert("com.google.guava:guava:16.0");
-			insert("org.apache.commons:commons-lang3:3.2.1");
-		}
-		root.insert("+libraries", outLibs);
-		root.insert("order", 1);
-		root.insert("fileId", QString("org.multimc.ftb.pack.json"));
-		root.insert("name", name());
-		root.insert("mcVersion", intendedVersionId());
-		root.insert("version", intendedVersionId());
-		FS::ensureFilePathExists(newDir.absoluteFilePath("patches/ftb.json"));
-		QFile out(newDir.absoluteFilePath("patches/ftb.json"));
-		if (!out.open(QFile::WriteOnly | QFile::Truncate))
-		{
-			qCritical() << "Couldn't open" << out.fileName() << ":" << out.errorString();
-			return;
-		}
-		out.write(QJsonDocument(root).toJson());
-	}
-	// copy libraries
-	{
-		qDebug() << "Copying FTB libraries";
-		for (auto library : libraryNames)
-		{
-			GradleSpecifier lib(library);
-			const QString out = QDir::current().absoluteFilePath("libraries/" + lib.toPath());
-			if (QFile::exists(out))
-			{
-				continue;
-			}
-			if (!FS::ensureFilePathExists(out))
-			{
-				qCritical() << "Couldn't create folder structure for" << out;
-			}
-			if (!QFile::copy(librariesPath().absoluteFilePath(lib.toPath()), out))
-			{
-				qCritical() << "Couldn't copy" << QString(lib);
-			}
-		}
-	}
-	// now set the target instance to be plain OneSix
-	INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg"));
-	settings_obj.registerSetting("InstanceType", "Legacy");
-	QString inst_type = settings_obj.get("InstanceType").toString();
-	settings_obj.set("InstanceType", "OneSix");
-}
-
-QString OneSixFTBInstance::id() const
-{
-	return "FTB/" + BaseInstance::id();
-}
-
-QDir OneSixFTBInstance::librariesPath() const
-{
-	return QDir(m_globalSettings->get("FTBRoot").toString() + "/libraries");
-}
-
-QDir OneSixFTBInstance::versionsPath() const
-{
-	return QDir(m_globalSettings->get("FTBRoot").toString() + "/versions");
-}
-
-bool OneSixFTBInstance::providesVersionFile() const
-{
-	return true;
-}
-
-void OneSixFTBInstance::createProfile()
-{
-	m_profile.reset(new MinecraftProfile(new FTBProfileStrategy(this)));
-}
-
-std::shared_ptr<Task> OneSixFTBInstance::createUpdateTask()
-{
-	return OneSixInstance::createUpdateTask();
-}
-
-QString OneSixFTBInstance::typeName() const
-{
-	return tr("OneSix FTB");
-}
-
-#include "OneSixFTBInstance.moc"
diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.h b/libraries/logic/minecraft/ftb/OneSixFTBInstance.h
deleted file mode 100644
index e7f8f485..00000000
--- a/libraries/logic/minecraft/ftb/OneSixFTBInstance.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "minecraft/onesix/OneSixInstance.h"
-
-class OneSixFTBInstance : public OneSixInstance
-{
-	Q_OBJECT
-public:
-	explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-    virtual ~OneSixFTBInstance(){};
-
-	void copy(const QDir &newDir) override;
-
-	virtual void createProfile() override;
-
-	virtual std::shared_ptr<Task> createUpdateTask() override;
-
-	virtual QString id() const override;
-
-	QDir librariesPath() const override;
-	QDir versionsPath() const override;
-	bool providesVersionFile() const override;
-	virtual QString typeName() const override;
-	bool canExport() const override
-	{
-		return false;
-	}
-private:
-	SettingsObjectPtr m_globalSettings;
-};
diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.cpp b/libraries/logic/minecraft/legacy/LegacyInstance.cpp
deleted file mode 100644
index f8264f20..00000000
--- a/libraries/logic/minecraft/legacy/LegacyInstance.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QFileInfo>
-#include <QDir>
-#include <settings/Setting.h>
-
-#include "LegacyInstance.h"
-
-#include "minecraft/legacy/LegacyUpdate.h"
-#include "launch/LaunchTask.h"
-#include <launch/steps/LaunchMinecraft.h>
-#include <launch/steps/PostLaunchCommand.h>
-#include <launch/steps/ModMinecraftJar.h>
-#include <launch/steps/Update.h>
-#include <launch/steps/PreLaunchCommand.h>
-#include <launch/steps/TextPrint.h>
-#include <launch/steps/CheckJava.h>
-#include "minecraft/ModList.h"
-#include "minecraft/WorldList.h"
-#include <MMCZip.h>
-#include <FileSystem.h>
-
-LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: MinecraftInstance(globalSettings, settings, rootDir)
-{
-	m_lwjglFolderSetting = globalSettings->getSetting("LWJGLDir");
-	settings->registerSetting("NeedsRebuild", true);
-	settings->registerSetting("ShouldUpdate", false);
-	settings->registerSetting("JarVersion", "Unknown");
-	settings->registerSetting("LwjglVersion", "2.9.0");
-	settings->registerSetting("IntendedJarVersion", "");
-	/*
-	 * custom base jar has no default. it is determined in code... see the accessor methods for
-	 *it
-	 *
-	 * for instances that DO NOT have the CustomBaseJar setting (legacy instances),
-	 * [.]minecraft/bin/mcbackup.jar is the default base jar
-	 */
-	settings->registerSetting("UseCustomBaseJar", true);
-	settings->registerSetting("CustomBaseJar", "");
-}
-
-QString LegacyInstance::baseJar() const
-{
-	bool customJar = m_settings->get("UseCustomBaseJar").toBool();
-	if (customJar)
-	{
-		return customBaseJar();
-	}
-	else
-		return defaultBaseJar();
-}
-
-QString LegacyInstance::customBaseJar() const
-{
-	QString value = m_settings->get("CustomBaseJar").toString();
-	if (value.isNull() || value.isEmpty())
-	{
-		return defaultCustomBaseJar();
-	}
-	return value;
-}
-
-void LegacyInstance::setCustomBaseJar(QString val)
-{
-	if (val.isNull() || val.isEmpty() || val == defaultCustomBaseJar())
-		m_settings->reset("CustomBaseJar");
-	else
-		m_settings->set("CustomBaseJar", val);
-}
-
-void LegacyInstance::setShouldUseCustomBaseJar(bool val)
-{
-	m_settings->set("UseCustomBaseJar", val);
-}
-
-bool LegacyInstance::shouldUseCustomBaseJar() const
-{
-	return m_settings->get("UseCustomBaseJar").toBool();
-}
-
-
-std::shared_ptr<Task> LegacyInstance::createUpdateTask()
-{
-	// make sure the jar mods list is initialized by asking for it.
-	auto list = jarModList();
-	// create an update task
-	return std::shared_ptr<Task>(new LegacyUpdate(this, this));
-}
-
-std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr session)
-{
-	auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
-	auto pptr = process.get();
-
-	// print a header
-	{
-		process->appendStep(std::make_shared<TextPrint>(pptr, "Minecraft folder is:\n" + minecraftRoot() + "\n\n", MessageLevel::MultiMC));
-	}
-	{
-		auto step = std::make_shared<CheckJava>(pptr);
-		process->appendStep(step);
-	}
-	// run pre-launch command if that's needed
-	if(getPreLaunchCommand().size())
-	{
-		auto step = std::make_shared<PreLaunchCommand>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		process->appendStep(step);
-	}
-	// if we aren't in offline mode,.
-	if(session->status != AuthSession::PlayableOffline)
-	{
-		process->appendStep(std::make_shared<Update>(pptr));
-	}
-	// if there are any jar mods
-	if(getJarMods().size())
-	{
-		auto step = std::make_shared<ModMinecraftJar>(pptr);
-		process->appendStep(step);
-	}
-	// actually launch the game
-	{
-		auto step = std::make_shared<LaunchMinecraft>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		step->setAuthSession(session);
-		process->appendStep(step);
-	}
-	// run post-exit command if that's needed
-	if(getPostExitCommand().size())
-	{
-		auto step = std::make_shared<PostLaunchCommand>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		process->appendStep(step);
-	}
-	if (session)
-	{
-		process->setCensorFilter(createCensorFilterFromSession(session));
-	}
-	return process;
-}
-
-std::shared_ptr<Task> LegacyInstance::createJarModdingTask()
-{
-	class JarModTask : public Task
-	{
-	public:
-		explicit JarModTask(std::shared_ptr<LegacyInstance> inst) : Task(nullptr), m_inst(inst)
-		{
-		}
-		virtual void executeTask()
-		{
-			if (!m_inst->shouldRebuild())
-			{
-				emitSucceeded();
-				return;
-			}
-
-			// Get the mod list
-			auto modList = m_inst->getJarMods();
-
-			QFileInfo runnableJar(m_inst->runnableJar());
-			QFileInfo baseJar(m_inst->baseJar());
-			bool base_is_custom = m_inst->shouldUseCustomBaseJar();
-
-			// Nothing to do if there are no jar mods to install, no backup and just the mc jar
-			if (base_is_custom)
-			{
-				// yes, this can happen if the instance only has the runnable jar and not the base jar
-				// it *could* be assumed that such an instance is vanilla, but that wouldn't be safe
-				// because that's not something mmc4 guarantees
-				if (runnableJar.isFile() && !baseJar.exists() && modList.empty())
-				{
-					m_inst->setShouldRebuild(false);
-					emitSucceeded();
-					return;
-				}
-
-				setStatus(tr("Installing mods: Backing up minecraft.jar ..."));
-				if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath()))
-				{
-					emitFailed("It seems both the active and base jar are gone. A fresh base jar will "
-							"be used on next run.");
-					m_inst->setShouldRebuild(true);
-					m_inst->setShouldUpdate(true);
-					m_inst->setShouldUseCustomBaseJar(false);
-					return;
-				}
-			}
-
-			if (!baseJar.exists())
-			{
-				emitFailed("The base jar " + baseJar.filePath() + " does not exist");
-				return;
-			}
-
-			if (runnableJar.exists() && !QFile::remove(runnableJar.filePath()))
-			{
-				emitFailed("Failed to delete old minecraft.jar");
-				return;
-			}
-
-			setStatus(tr("Installing mods: Opening minecraft.jar ..."));
-
-			QString outputJarPath = runnableJar.filePath();
-			QString inputJarPath = baseJar.filePath();
-
-			if(!MMCZip::createModdedJar(inputJarPath, outputJarPath, modList))
-			{
-				emitFailed(tr("Failed to create the custom Minecraft jar file."));
-				return;
-			}
-			m_inst->setShouldRebuild(false);
-			// inst->UpdateVersion(true);
-			emitSucceeded();
-			return;
-
-		}
-		std::shared_ptr<LegacyInstance> m_inst;
-	};
-	return std::make_shared<JarModTask>(std::dynamic_pointer_cast<LegacyInstance>(shared_from_this()));
-}
-
-QString LegacyInstance::createLaunchScript(AuthSessionPtr session)
-{
-	QString launchScript;
-
-	// window size
-	QString windowParams;
-	if (settings()->get("LaunchMaximized").toBool())
-	{
-		windowParams = "max";
-	}
-	else
-	{
-		windowParams = QString("%1x%2").arg(settings()->get("MinecraftWinWidth").toInt()).arg(settings()->get("MinecraftWinHeight").toInt());
-	}
-
-	QString lwjgl = QDir(m_lwjglFolderSetting->get().toString() + "/" + lwjglVersion()).absolutePath();
-	launchScript += "userName " + session->player_name + "\n";
-	launchScript += "sessionId " + session->session + "\n";
-	launchScript += "windowTitle " + windowTitle() + "\n";
-	launchScript += "windowParams " + windowParams + "\n";
-	launchScript += "lwjgl " + lwjgl + "\n";
-	launchScript += "launcher legacy\n";
-	return launchScript;
-}
-
-void LegacyInstance::cleanupAfterRun()
-{
-	// FIXME: delete the launcher and icons and whatnot.
-}
-
-std::shared_ptr<ModList> LegacyInstance::coreModList() const
-{
-	if (!core_mod_list)
-	{
-		core_mod_list.reset(new ModList(coreModsDir()));
-	}
-	core_mod_list->update();
-	return core_mod_list;
-}
-
-std::shared_ptr<ModList> LegacyInstance::jarModList() const
-{
-	if (!jar_mod_list)
-	{
-		auto list = new ModList(jarModsDir(), modListFile());
-		connect(list, SIGNAL(changed()), SLOT(jarModsChanged()));
-		jar_mod_list.reset(list);
-	}
-	jar_mod_list->update();
-	return jar_mod_list;
-}
-
-QList<Mod> LegacyInstance::getJarMods() const
-{
-	return jarModList()->allMods();
-}
-
-void LegacyInstance::jarModsChanged()
-{
-	qDebug() << "Jar mods of instance " << name() << " have changed. Jar will be rebuilt.";
-	setShouldRebuild(true);
-}
-
-std::shared_ptr<ModList> LegacyInstance::loaderModList() const
-{
-	if (!loader_mod_list)
-	{
-		loader_mod_list.reset(new ModList(loaderModsDir()));
-	}
-	loader_mod_list->update();
-	return loader_mod_list;
-}
-
-std::shared_ptr<ModList> LegacyInstance::texturePackList() const
-{
-	if (!texture_pack_list)
-	{
-		texture_pack_list.reset(new ModList(texturePacksDir()));
-	}
-	texture_pack_list->update();
-	return texture_pack_list;
-}
-
-std::shared_ptr<WorldList> LegacyInstance::worldList() const
-{
-	if (!m_world_list)
-	{
-		m_world_list.reset(new WorldList(savesDir()));
-	}
-	return m_world_list;
-}
-
-QString LegacyInstance::jarModsDir() const
-{
-	return FS::PathCombine(instanceRoot(), "instMods");
-}
-
-QString LegacyInstance::binDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "bin");
-}
-
-QString LegacyInstance::libDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "lib");
-}
-
-QString LegacyInstance::savesDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "saves");
-}
-
-QString LegacyInstance::loaderModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "mods");
-}
-
-QString LegacyInstance::coreModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "coremods");
-}
-
-QString LegacyInstance::resourceDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "resources");
-}
-QString LegacyInstance::texturePacksDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "texturepacks");
-}
-
-QString LegacyInstance::runnableJar() const
-{
-	return FS::PathCombine(binDir(), "minecraft.jar");
-}
-
-QString LegacyInstance::modListFile() const
-{
-	return FS::PathCombine(instanceRoot(), "modlist");
-}
-
-QString LegacyInstance::instanceConfigFolder() const
-{
-	return FS::PathCombine(minecraftRoot(), "config");
-}
-
-bool LegacyInstance::shouldRebuild() const
-{
-	return m_settings->get("NeedsRebuild").toBool();
-}
-
-void LegacyInstance::setShouldRebuild(bool val)
-{
-	m_settings->set("NeedsRebuild", val);
-}
-
-QString LegacyInstance::currentVersionId() const
-{
-	return m_settings->get("JarVersion").toString();
-}
-
-QString LegacyInstance::lwjglVersion() const
-{
-	return m_settings->get("LwjglVersion").toString();
-}
-
-void LegacyInstance::setLWJGLVersion(QString val)
-{
-	m_settings->set("LwjglVersion", val);
-}
-
-QString LegacyInstance::intendedVersionId() const
-{
-	return m_settings->get("IntendedJarVersion").toString();
-}
-
-bool LegacyInstance::setIntendedVersionId(QString version)
-{
-	settings()->set("IntendedJarVersion", version);
-	setShouldUpdate(true);
-	return true;
-}
-
-bool LegacyInstance::shouldUpdate() const
-{
-	QVariant var = settings()->get("ShouldUpdate");
-	if (!var.isValid() || var.toBool() == false)
-	{
-		return intendedVersionId() != currentVersionId();
-	}
-	return true;
-}
-
-void LegacyInstance::setShouldUpdate(bool val)
-{
-	settings()->set("ShouldUpdate", val);
-}
-
-QString LegacyInstance::defaultBaseJar() const
-{
-	return "versions/" + intendedVersionId() + "/" + intendedVersionId() + ".jar";
-}
-
-QString LegacyInstance::defaultCustomBaseJar() const
-{
-	return FS::PathCombine(binDir(), "mcbackup.jar");
-}
-
-QString LegacyInstance::lwjglFolder() const
-{
-	return m_lwjglFolderSetting->get().toString();
-}
-
-QString LegacyInstance::typeName() const
-{
-	return tr("Legacy");
-}
diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.h b/libraries/logic/minecraft/legacy/LegacyInstance.h
deleted file mode 100644
index 3bef240d..00000000
--- a/libraries/logic/minecraft/legacy/LegacyInstance.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "minecraft/MinecraftInstance.h"
-
-#include "multimc_logic_export.h"
-
-class ModList;
-class Task;
-
-class MULTIMC_LOGIC_EXPORT LegacyInstance : public MinecraftInstance
-{
-	Q_OBJECT
-public:
-
-	explicit LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-
-	virtual void init() override {};
-
-	/// Path to the instance's minecraft.jar
-	QString runnableJar() const;
-
-	//! Path to the instance's modlist file.
-	QString modListFile() const;
-
-	/*
-	////// Edit Instance Dialog stuff //////
-	virtual QList<BasePage *> getPages();
-	virtual QString dialogTitle();
-	*/
-
-	//////  Mod Lists  //////
-	std::shared_ptr<ModList> jarModList() const ;
-	virtual QList< Mod > getJarMods() const override;
-	std::shared_ptr<ModList> coreModList() const;
-	std::shared_ptr<ModList> loaderModList() const;
-	std::shared_ptr<ModList> texturePackList() const override;
-	std::shared_ptr<WorldList> worldList() const override;
-
-	////// Directories //////
-	QString libDir() const;
-	QString savesDir() const;
-	QString texturePacksDir() const;
-	QString jarModsDir() const;
-	QString binDir() const;
-	QString loaderModsDir() const;
-	QString coreModsDir() const;
-	QString resourceDir() const;
-	virtual QString instanceConfigFolder() const override;
-
-		/// Get the curent base jar of this instance. By default, it's the
-	/// versions/$version/$version.jar
-	QString baseJar() const;
-
-	/// the default base jar of this instance
-	QString defaultBaseJar() const;
-	/// the default custom base jar of this instance
-	QString defaultCustomBaseJar() const;
-
-	/*!
-	 * Whether or not custom base jar is used
-	 */
-	bool shouldUseCustomBaseJar() const;
-	void setShouldUseCustomBaseJar(bool val);
-
-	/*!
-	 * The value of the custom base jar
-	 */
-	QString customBaseJar() const;
-	void setCustomBaseJar(QString val);
-
-	/*!
-	 * Whether or not the instance's minecraft.jar needs to be rebuilt.
-	 * If this is true, when the instance launches, its jar mods will be
-	 * re-added to a fresh minecraft.jar file.
-	 */
-	bool shouldRebuild() const;
-	void setShouldRebuild(bool val);
-
-	virtual QString currentVersionId() const override;
-
-	//! The version of LWJGL that this instance uses.
-	QString lwjglVersion() const;
-
-	//! Where the lwjgl versions foor this instance can be found... HACK HACK HACK
-	QString lwjglFolder() const;
-
-	/// st the version of LWJGL libs this instance will use
-	void setLWJGLVersion(QString val);
-
-	virtual QString intendedVersionId() const override;
-	virtual bool setIntendedVersionId(QString version) override;
-
-	virtual QSet<QString> traits() override
-	{
-		return {"legacy-instance", "texturepacks"};
-	};
-
-	virtual bool shouldUpdate() const override;
-	virtual void setShouldUpdate(bool val) override;
-	virtual std::shared_ptr<Task> createUpdateTask() override;
-
-	virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override;
-
-	virtual std::shared_ptr<Task> createJarModdingTask() override;
-
-	virtual QString createLaunchScript(AuthSessionPtr session) override;
-
-	virtual void cleanupAfterRun() override;
-
-	virtual QString typeName() const override;
-
-	bool canExport() const override
-	{
-		return true;
-	}
-
-protected:
-	mutable std::shared_ptr<ModList> jar_mod_list;
-	mutable std::shared_ptr<ModList> core_mod_list;
-	mutable std::shared_ptr<ModList> loader_mod_list;
-	mutable std::shared_ptr<ModList> texture_pack_list;
-	mutable std::shared_ptr<WorldList> m_world_list;
-	std::shared_ptr<Setting> m_lwjglFolderSetting;
-protected
-slots:
-	virtual void jarModsChanged();
-};
diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.cpp b/libraries/logic/minecraft/legacy/LegacyUpdate.cpp
deleted file mode 100644
index 2d7e8dd2..00000000
--- a/libraries/logic/minecraft/legacy/LegacyUpdate.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QStringList>
-#include <quazip.h>
-#include <quazipfile.h>
-#include <QDebug>
-
-#include "Env.h"
-#include "BaseInstance.h"
-#include "net/URLConstants.h"
-#include "MMCZip.h"
-
-#include "LegacyUpdate.h"
-
-#include "LwjglVersionList.h"
-#include "minecraft/MinecraftVersionList.h"
-#include "minecraft/ModList.h"
-#include "LegacyInstance.h"
-#include <FileSystem.h>
-
-LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
-{
-}
-
-void LegacyUpdate::executeTask()
-{
-	fmllibsStart();
-}
-
-void LegacyUpdate::fmllibsStart()
-{
-	// Get the mod list
-	LegacyInstance *inst = (LegacyInstance *)m_inst;
-	auto modList = inst->jarModList();
-
-	bool forge_present = false;
-
-	QString version = inst->intendedVersionId();
-	auto & fmlLibsMapping = g_VersionFilterData.fmlLibsMapping;
-	if (!fmlLibsMapping.contains(version))
-	{
-		lwjglStart();
-		return;
-	}
-
-	auto &libList = fmlLibsMapping[version];
-
-	// determine if we need some libs for FML or forge
-	setStatus(tr("Checking for FML libraries..."));
-	for (unsigned i = 0; i < modList->size(); i++)
-	{
-		auto &mod = modList->operator[](i);
-
-		// do not use disabled mods.
-		if (!mod.enabled())
-			continue;
-
-		if (mod.type() != Mod::MOD_ZIPFILE)
-			continue;
-
-		if (mod.mmc_id().contains("forge", Qt::CaseInsensitive))
-		{
-			forge_present = true;
-			break;
-		}
-		if (mod.mmc_id().contains("fml", Qt::CaseInsensitive))
-		{
-			forge_present = true;
-			break;
-		}
-	}
-	// we don't...
-	if (!forge_present)
-	{
-		lwjglStart();
-		return;
-	}
-
-	// now check the lib folder inside the instance for files.
-	for (auto &lib : libList)
-	{
-		QFileInfo libInfo(FS::PathCombine(inst->libDir(), lib.filename));
-		if (libInfo.exists())
-			continue;
-		fmlLibsToProcess.append(lib);
-	}
-
-	// if everything is in place, there's nothing to do here...
-	if (fmlLibsToProcess.isEmpty())
-	{
-		lwjglStart();
-		return;
-	}
-
-	// download missing libs to our place
-	setStatus(tr("Dowloading FML libraries..."));
-	auto dljob = new NetJob("FML libraries");
-	auto metacache = ENV.metacache();
-	for (auto &lib : fmlLibsToProcess)
-	{
-		auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-		QString urlString = lib.ours ? URLConstants::FMLLIBS_OUR_BASE_URL + lib.filename
-									 : URLConstants::FMLLIBS_FORGE_BASE_URL + lib.filename;
-		dljob->addNetAction(CacheDownload::make(QUrl(urlString), entry));
-	}
-
-	connect(dljob, &NetJob::succeeded, this, &LegacyUpdate::fmllibsFinished);
-	connect(dljob, &NetJob::failed, this, &LegacyUpdate::fmllibsFailed);
-	connect(dljob, &NetJob::progress, this, &LegacyUpdate::progress);
-	legacyDownloadJob.reset(dljob);
-	legacyDownloadJob->start();
-}
-
-void LegacyUpdate::fmllibsFinished()
-{
-	legacyDownloadJob.reset();
-	if(!fmlLibsToProcess.isEmpty())
-	{
-		setStatus(tr("Copying FML libraries into the instance..."));
-		LegacyInstance *inst = (LegacyInstance *)m_inst;
-		auto metacache = ENV.metacache();
-		int index = 0;
-		for (auto &lib : fmlLibsToProcess)
-		{
-			progress(index, fmlLibsToProcess.size());
-			auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-			auto path = FS::PathCombine(inst->libDir(), lib.filename);
-			if(!FS::ensureFilePathExists(path))
-			{
-				emitFailed(tr("Failed creating FML library folder inside the instance."));
-				return;
-			}
-			if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->libDir(), lib.filename)))
-			{
-				emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename));
-				return;
-			}
-			index++;
-		}
-		progress(index, fmlLibsToProcess.size());
-	}
-	lwjglStart();
-}
-
-void LegacyUpdate::fmllibsFailed(QString reason)
-{
-	emitFailed(tr("Game update failed: it was impossible to fetch the required FML libraries. Reason: %1").arg(reason));
-	return;
-}
-
-void LegacyUpdate::lwjglStart()
-{
-	LegacyInstance *inst = (LegacyInstance *)m_inst;
-
-	lwjglVersion = inst->lwjglVersion();
-	lwjglTargetPath = FS::PathCombine(inst->lwjglFolder(), lwjglVersion);
-	lwjglNativesPath = FS::PathCombine(lwjglTargetPath, "natives");
-
-	// if the 'done' file exists, we don't have to download this again
-	QFileInfo doneFile(FS::PathCombine(lwjglTargetPath, "done"));
-	if (doneFile.exists())
-	{
-		jarStart();
-		return;
-	}
-
-	auto list = std::dynamic_pointer_cast<LWJGLVersionList>(ENV.getVersionList("org.lwjgl.legacy"));
-	if (!list->isLoaded())
-	{
-		emitFailed("Too soon! Let the LWJGL list load :)");
-		return;
-	}
-
-	setStatus(tr("Downloading new LWJGL..."));
-	auto version = std::dynamic_pointer_cast<LWJGLVersion>(list->findVersion(lwjglVersion));
-	if (!version)
-	{
-		emitFailed("Game update failed: the selected LWJGL version is invalid.");
-		return;
-	}
-
-	QString url = version->url();
-	QUrl realUrl(url);
-	QString hostname = realUrl.host();
-	auto worker = ENV.qnam();
-	QNetworkRequest req(realUrl);
-	req.setRawHeader("Host", hostname.toLatin1());
-	req.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Cached)");
-	QNetworkReply *rep = worker->get(req);
-
-	m_reply = std::shared_ptr<QNetworkReply>(rep);
-	connect(rep, &QNetworkReply::downloadProgress, this, &LegacyUpdate::progress);
-	connect(worker.get(), &QNetworkAccessManager::finished, this, &LegacyUpdate::lwjglFinished);
-}
-
-void LegacyUpdate::lwjglFinished(QNetworkReply *reply)
-{
-	if (m_reply.get() != reply)
-	{
-		return;
-	}
-	if (reply->error() != QNetworkReply::NoError)
-	{
-		emitFailed("Failed to download: " + reply->errorString() +
-				   "\nSometimes you have to wait a bit if you download many LWJGL versions in "
-				   "a row. YMMV");
-		return;
-	}
-	auto worker = ENV.qnam();
-	// Here i check if there is a cookie for me in the reply and extract it
-	QList<QNetworkCookie> cookies =
-		qvariant_cast<QList<QNetworkCookie>>(reply->header(QNetworkRequest::SetCookieHeader));
-	if (cookies.count() != 0)
-	{
-		// you must tell which cookie goes with which url
-		worker->cookieJar()->setCookiesFromUrl(cookies, QUrl("sourceforge.net"));
-	}
-
-	// here you can check for the 302 or whatever other header i need
-	QVariant newLoc = reply->header(QNetworkRequest::LocationHeader);
-	if (newLoc.isValid())
-	{
-		QString redirectedTo = reply->header(QNetworkRequest::LocationHeader).toString();
-		QUrl realUrl(redirectedTo);
-		QString hostname = realUrl.host();
-		QNetworkRequest req(redirectedTo);
-		req.setRawHeader("Host", hostname.toLatin1());
-		req.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Cached)");
-		QNetworkReply *rep = worker->get(req);
-		connect(rep, &QNetworkReply::downloadProgress, this, &LegacyUpdate::progress);
-		m_reply = std::shared_ptr<QNetworkReply>(rep);
-		return;
-	}
-	QFile saveMe("lwjgl.zip");
-	saveMe.open(QIODevice::WriteOnly);
-	saveMe.write(m_reply->readAll());
-	saveMe.close();
-	setStatus(tr("Installing new LWJGL..."));
-	extractLwjgl();
-	jarStart();
-}
-void LegacyUpdate::extractLwjgl()
-{
-	// make sure the directories are there
-
-	bool success = FS::ensureFolderPathExists(lwjglNativesPath);
-
-	if (!success)
-	{
-		emitFailed("Failed to extract the lwjgl libs - error when creating required folders.");
-		return;
-	}
-
-	QuaZip zip("lwjgl.zip");
-	if (!zip.open(QuaZip::mdUnzip))
-	{
-		emitFailed("Failed to extract the lwjgl libs - not a valid archive.");
-		return;
-	}
-
-	// and now we are going to access files inside it
-	QuaZipFile file(&zip);
-	const QString jarNames[] = {"jinput.jar", "lwjgl_util.jar", "lwjgl.jar"};
-	for (bool more = zip.goToFirstFile(); more; more = zip.goToNextFile())
-	{
-		if (!file.open(QIODevice::ReadOnly))
-		{
-			zip.close();
-			emitFailed("Failed to extract the lwjgl libs - error while reading archive.");
-			return;
-		}
-		QuaZipFileInfo info;
-		QString name = file.getActualFileName();
-		if (name.endsWith('/'))
-		{
-			file.close();
-			continue;
-		}
-		QString destFileName;
-		// Look for the jars
-		for (int i = 0; i < 3; i++)
-		{
-			if (name.endsWith(jarNames[i]))
-			{
-				destFileName = FS::PathCombine(lwjglTargetPath, jarNames[i]);
-			}
-		}
-		// Not found? look for the natives
-		if (destFileName.isEmpty())
-		{
-#ifdef Q_OS_WIN32
-			QString nativesDir = "windows";
-#else
-#ifdef Q_OS_MAC
-			QString nativesDir = "macosx";
-#else
-			QString nativesDir = "linux";
-#endif
-#endif
-			if (name.contains(nativesDir))
-			{
-				int lastSlash = name.lastIndexOf('/');
-				int lastBackSlash = name.lastIndexOf('\\');
-				if (lastSlash != -1)
-					name = name.mid(lastSlash + 1);
-				else if (lastBackSlash != -1)
-					name = name.mid(lastBackSlash + 1);
-				destFileName = FS::PathCombine(lwjglNativesPath, name);
-			}
-		}
-		// Now if destFileName is still empty, go to the next file.
-		if (!destFileName.isEmpty())
-		{
-			setStatus(tr("Installing new LWJGL - extracting ") + name + "...");
-			QFile output(destFileName);
-			output.open(QIODevice::WriteOnly);
-			output.write(file.readAll());
-			output.close();
-		}
-		file.close(); // do not forget to close!
-	}
-	zip.close();
-	m_reply.reset();
-	QFile doneFile(FS::PathCombine(lwjglTargetPath, "done"));
-	doneFile.open(QIODevice::WriteOnly);
-	doneFile.write("done.");
-	doneFile.close();
-}
-
-void LegacyUpdate::lwjglFailed(QString reason)
-{
-	emitFailed(tr("Bad stuff happened while trying to get the lwjgl libs: %1").arg(reason));
-}
-
-void LegacyUpdate::jarStart()
-{
-	LegacyInstance *inst = (LegacyInstance *)m_inst;
-	if (!inst->shouldUpdate() || inst->shouldUseCustomBaseJar())
-	{
-		emitSucceeded();
-		return;
-	}
-
-	setStatus(tr("Checking for jar updates..."));
-	// Make directories
-	QDir binDir(inst->binDir());
-	if (!binDir.exists() && !binDir.mkpath("."))
-	{
-		emitFailed("Failed to create bin folder.");
-		return;
-	}
-
-	// Build a list of URLs that will need to be downloaded.
-	setStatus(tr("Downloading new minecraft.jar ..."));
-
-	QString version_id = inst->intendedVersionId();
-
-	auto dljob = new NetJob("Minecraft.jar for version " + version_id);
-
-	auto metacache = ENV.metacache();
-	auto entry = metacache->resolveEntry("versions", URLConstants::getJarPath(version_id));
-	dljob->addNetAction(CacheDownload::make(QUrl(URLConstants::getLegacyJarUrl(version_id)), entry));
-	connect(dljob, SIGNAL(succeeded()), SLOT(jarFinished()));
-	connect(dljob, SIGNAL(failed(QString)), SLOT(jarFailed(QString)));
-	connect(dljob, SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	legacyDownloadJob.reset(dljob);
-	legacyDownloadJob->start();
-}
-
-void LegacyUpdate::jarFinished()
-{
-	// process the jar
-	emitSucceeded();
-}
-
-void LegacyUpdate::jarFailed(QString reason)
-{
-	// bad, bad
-	emitFailed(tr("Failed to download the minecraft jar: %1.").arg(reason));
-}
diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.h b/libraries/logic/minecraft/legacy/LegacyUpdate.h
deleted file mode 100644
index c52bf934..00000000
--- a/libraries/logic/minecraft/legacy/LegacyUpdate.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QList>
-#include <QUrl>
-
-#include "net/NetJob.h"
-#include "tasks/Task.h"
-#include "minecraft/VersionFilterData.h"
-
-class MinecraftVersion;
-class BaseInstance;
-class QuaZip;
-class Mod;
-
-class LegacyUpdate : public Task
-{
-	Q_OBJECT
-public:
-	explicit LegacyUpdate(BaseInstance *inst, QObject *parent = 0);
-	virtual void executeTask();
-
-private
-slots:
-	void lwjglStart();
-	void lwjglFinished(QNetworkReply *);
-	void lwjglFailed(QString reason);
-
-	void jarStart();
-	void jarFinished();
-	void jarFailed(QString reason);
-
-	void fmllibsStart();
-	void fmllibsFinished();
-	void fmllibsFailed(QString reason);
-
-	void extractLwjgl();
-
-private:
-
-	std::shared_ptr<QNetworkReply> m_reply;
-
-	// target version, determined during this task
-	// MinecraftVersion *targetVersion;
-	QString lwjglURL;
-	QString lwjglVersion;
-
-	QString lwjglTargetPath;
-	QString lwjglNativesPath;
-
-private:
-	NetJobPtr legacyDownloadJob;
-	BaseInstance *m_inst = nullptr;
-	QList<FMLlib> fmlLibsToProcess;
-};
diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.cpp b/libraries/logic/minecraft/legacy/LwjglVersionList.cpp
deleted file mode 100644
index bb017368..00000000
--- a/libraries/logic/minecraft/legacy/LwjglVersionList.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LwjglVersionList.h"
-#include "Env.h"
-
-#include <QtNetwork>
-#include <QtXml>
-#include <QRegExp>
-
-#include <QDebug>
-
-#define RSS_URL "http://sourceforge.net/projects/java-game-lib/rss"
-
-LWJGLVersionList::LWJGLVersionList(QObject *parent) : BaseVersionList(parent)
-{
-	setLoading(false);
-}
-
-QVariant LWJGLVersionList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	const PtrLWJGLVersion version = m_vlist.at(index.row());
-
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		return version->name();
-
-	case Qt::ToolTipRole:
-		return version->url();
-
-	default:
-		return QVariant();
-	}
-}
-
-QVariant LWJGLVersionList::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		return tr("Version");
-
-	case Qt::ToolTipRole:
-		return tr("LWJGL version name.");
-
-	default:
-		return QVariant();
-	}
-}
-
-int LWJGLVersionList::columnCount(const QModelIndex &parent) const
-{
-	return 1;
-}
-
-bool LWJGLVersionList::isLoading() const
-{
-	return m_loading;
-}
-
-void LWJGLVersionList::loadList()
-{
-	Q_ASSERT_X(!m_loading, "loadList", "list is already loading (m_loading is true)");
-
-	setLoading(true);
-	auto worker = ENV.qnam();
-	QNetworkRequest req(QUrl(RSS_URL));
-	req.setRawHeader("Accept", "application/rss+xml, text/xml, */*");
-	req.setRawHeader("User-Agent", "MultiMC/5.0 (Uncached)");
-	reply = worker->get(req);
-	connect(reply, SIGNAL(finished()), SLOT(netRequestComplete()));
-}
-
-inline QDomElement getDomElementByTagName(QDomElement parent, QString tagname)
-{
-	QDomNodeList elementList = parent.elementsByTagName(tagname);
-	if (elementList.count())
-		return elementList.at(0).toElement();
-	else
-		return QDomElement();
-}
-
-void LWJGLVersionList::netRequestComplete()
-{
-	if (reply->error() == QNetworkReply::NoError)
-	{
-		QRegExp lwjglRegex("lwjgl-(([0-9]\\.?)+)\\.zip");
-		Q_ASSERT_X(lwjglRegex.isValid(), "load LWJGL list", "LWJGL regex is invalid");
-
-		QDomDocument doc;
-
-		QString xmlErrorMsg;
-		int errorLine;
-		auto rawData = reply->readAll();
-		if (!doc.setContent(rawData, false, &xmlErrorMsg, &errorLine))
-		{
-			failed("Failed to load LWJGL list. XML error: " + xmlErrorMsg + " at line " +
-				   QString::number(errorLine));
-			setLoading(false);
-			return;
-		}
-
-		QDomNodeList items = doc.elementsByTagName("item");
-
-		QList<PtrLWJGLVersion> tempList;
-
-		for (int i = 0; i < items.length(); i++)
-		{
-			Q_ASSERT_X(items.at(i).isElement(), "load LWJGL list",
-					   "XML element isn't an element... wat?");
-
-			QDomElement linkElement = getDomElementByTagName(items.at(i).toElement(), "link");
-			if (linkElement.isNull())
-			{
-				qDebug() << "Link element" << i << "in RSS feed doesn't exist! Skipping.";
-				continue;
-			}
-
-			QString link = linkElement.text();
-
-			// Make sure it's a download link.
-			if (link.endsWith("/download") && link.contains(lwjglRegex))
-			{
-				QString name = link.mid(lwjglRegex.indexIn(link) + 6);
-				// Subtract 4 here to remove the .zip file extension.
-				name = name.left(lwjglRegex.matchedLength() - 10);
-
-				QUrl url(link);
-				if (!url.isValid())
-				{
-					qWarning() << "LWJGL version URL isn't valid:" << link << "Skipping.";
-					continue;
-				}
-				qDebug() << "Discovered LWGL version" << name << "at" << link;
-				tempList.append(std::make_shared<LWJGLVersion>(name, link));
-			}
-		}
-
-		beginResetModel();
-		m_vlist.swap(tempList);
-		endResetModel();
-
-		qDebug() << "Loaded LWJGL list.";
-		finished();
-	}
-	else
-	{
-		failed("Failed to load LWJGL list. Network error: " + reply->errorString());
-	}
-
-	setLoading(false);
-	reply->deleteLater();
-}
-
-void LWJGLVersionList::failed(QString msg)
-{
-	qCritical() << msg;
-	emit loadListFailed(msg);
-}
-
-void LWJGLVersionList::finished()
-{
-	emit loadListFinished();
-}
-
-void LWJGLVersionList::setLoading(bool loading)
-{
-	m_loading = loading;
-	emit loadingStateUpdated(m_loading);
-}
diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.h b/libraries/logic/minecraft/legacy/LwjglVersionList.h
deleted file mode 100644
index f043f6e2..00000000
--- a/libraries/logic/minecraft/legacy/LwjglVersionList.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QUrl>
-#include <QNetworkReply>
-#include <memory>
-
-#include "BaseVersion.h"
-#include "BaseVersionList.h"
-
-#include "multimc_logic_export.h"
-
-class LWJGLVersion;
-typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;
-
-class MULTIMC_LOGIC_EXPORT LWJGLVersion : public BaseVersion
-{
-public:
-	LWJGLVersion(const QString &name, const QString &url)
-		: m_name(name), m_url(url)
-	{
-	}
-
-	virtual QString descriptor()
-	{
-		return m_name;
-	}
-
-	virtual QString name()
-	{
-		return m_name;
-	}
-
-	virtual QString typeString() const
-	{
-		return QObject::tr("Upstream");
-	}
-
-	QString url() const
-	{
-		return m_url;
-	}
-
-protected:
-	QString m_name;
-	QString m_url;
-};
-
-class MULTIMC_LOGIC_EXPORT LWJGLVersionList : public BaseVersionList
-{
-	Q_OBJECT
-public:
-	explicit LWJGLVersionList(QObject *parent = 0);
-
-	bool isLoaded() override
-	{
-		return m_vlist.length() > 0;
-	}
-	virtual const BaseVersionPtr at(int i) const override
-	{
-		return m_vlist[i];
-	}
-
-	virtual Task* getLoadTask() override
-	{
-		return nullptr;
-	}
-
-	virtual void sortVersions() override {};
-
-	virtual void updateListData(QList< BaseVersionPtr > versions) override {};
-
-	int count() const override
-	{
-		return m_vlist.length();
-	}
-
-	virtual QVariant data(const QModelIndex &index, int role) const override;
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-	virtual int rowCount(const QModelIndex &parent) const override
-	{
-		return count();
-	}
-	virtual int columnCount(const QModelIndex &parent) const override;
-
-	virtual bool isLoading() const;
-	virtual bool errored() const
-	{
-		return m_errored;
-	}
-
-	virtual QString lastErrorMsg() const
-	{
-		return m_lastErrorMsg;
-	}
-
-public
-slots:
-	/*!
-	 * Loads the version list.
-	 * This is done asynchronously. On success, the loadListFinished() signal will
-	 * be emitted. The list model will be reset as well, resulting in the modelReset()
-	 * signal being emitted. Note that the model will be reset before loadListFinished() is
-	 * emitted.
-	 * If loading the list failed, the loadListFailed(QString msg),
-	 * signal will be emitted.
-	 */
-	virtual void loadList();
-
-signals:
-	/*!
-	 * Emitted when the list either starts or finishes loading.
-	 * \param loading Whether or not the list is loading.
-	 */
-	void loadingStateUpdated(bool loading);
-
-	void loadListFinished();
-
-	void loadListFailed(QString msg);
-
-private:
-	QList<PtrLWJGLVersion> m_vlist;
-
-	QNetworkReply *m_netReply;
-	QNetworkReply *reply;
-
-	bool m_loading;
-	bool m_errored;
-	QString m_lastErrorMsg;
-
-	void failed(QString msg);
-
-	void finished();
-
-	void setLoading(bool loading);
-
-private
-slots:
-	virtual void netRequestComplete();
-};
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
deleted file mode 100644
index 25297fa4..00000000
--- a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LiteLoaderInstaller.h"
-
-#include <QJsonArray>
-#include <QJsonDocument>
-
-#include <QDebug>
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/Library.h"
-#include "minecraft/onesix/OneSixInstance.h"
-#include <minecraft/onesix/OneSixVersionFormat.h>
-#include "minecraft/liteloader/LiteLoaderVersionList.h"
-#include "Exception.h"
-
-LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
-{
-}
-
-void LiteLoaderInstaller::prepare(LiteLoaderVersionPtr version)
-{
-	m_version = version;
-}
-bool LiteLoaderInstaller::add(OneSixInstance *to)
-{
-	if (!BaseInstaller::add(to))
-	{
-		return false;
-	}
-
-	QJsonObject obj;
-
-	obj.insert("mainClass", QString("net.minecraft.launchwrapper.Launch"));
-	obj.insert("+tweakers", QJsonArray::fromStringList(QStringList() << m_version->tweakClass));
-	obj.insert("order", 10);
-
-	QJsonArray libraries;
-
-	for (auto Library : m_version->libraries)
-	{
-		libraries.append(OneSixVersionFormat::libraryToJson(Library.get()));
-	}
-
-	// liteloader
-	{
-		Library liteloaderLib("com.mumfrey:liteloader:" + m_version->version);
-		liteloaderLib.setAbsoluteUrl(QString("http://dl.liteloader.com/versions/com/mumfrey/liteloader/%1/%2").arg(m_version->mcVersion, m_version->file));
-		QJsonObject llLibObj = OneSixVersionFormat::libraryToJson(&liteloaderLib);
-		libraries.append(llLibObj);
-	}
-
-	obj.insert("+libraries", libraries);
-	obj.insert("name", QString("LiteLoader"));
-	obj.insert("fileId", id());
-	obj.insert("version", m_version->version);
-	obj.insert("mcVersion", to->intendedVersionId());
-
-	QFile file(filename(to->instanceRoot()));
-	if (!file.open(QFile::WriteOnly))
-	{
-		qCritical() << "Error opening" << file.fileName()
-					 << "for reading:" << file.errorString();
-		return false;
-	}
-	file.write(QJsonDocument(obj).toJson());
-	file.close();
-
-	return true;
-}
-
-class LiteLoaderInstallTask : public Task
-{
-	Q_OBJECT
-public:
-	LiteLoaderInstallTask(LiteLoaderInstaller *installer, OneSixInstance *instance,
-						  BaseVersionPtr version, QObject *parent)
-		: Task(parent), m_installer(installer), m_instance(instance), m_version(version)
-	{
-	}
-
-protected:
-	void executeTask() override
-	{
-		LiteLoaderVersionPtr liteloaderVersion =
-			std::dynamic_pointer_cast<LiteLoaderVersion>(m_version);
-		if (!liteloaderVersion)
-		{
-			return;
-		}
-		m_installer->prepare(liteloaderVersion);
-		if (!m_installer->add(m_instance))
-		{
-			emitFailed(tr("For reasons unknown, the LiteLoader installation failed. Check your "
-						  "MultiMC log files for details."));
-		}
-		else
-		{
-			try
-			{
-				m_instance->reloadProfile();
-				emitSucceeded();
-			}
-			catch (Exception &e)
-			{
-				emitFailed(e.cause());
-			}
-			catch (...)
-			{
-				emitFailed(
-					tr("Failed to load the version description file for reasons unknown."));
-			}
-		}
-	}
-
-private:
-	LiteLoaderInstaller *m_installer;
-	OneSixInstance *m_instance;
-	BaseVersionPtr m_version;
-};
-
-Task *LiteLoaderInstaller::createInstallTask(OneSixInstance *instance,
-														 BaseVersionPtr version,
-														 QObject *parent)
-{
-	return new LiteLoaderInstallTask(this, instance, version, parent);
-}
-
-#include "LiteLoaderInstaller.moc"
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h b/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h
deleted file mode 100644
index fe0aee3d..00000000
--- a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QMap>
-
-#include "BaseInstaller.h"
-#include "LiteLoaderVersionList.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT LiteLoaderInstaller : public BaseInstaller
-{
-public:
-	LiteLoaderInstaller();
-
-	void prepare(LiteLoaderVersionPtr version);
-	bool add(OneSixInstance *to) override;
-	virtual QString id() const override { return "com.mumfrey.liteloader"; }
-
-	Task *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override;
-
-private:
-	LiteLoaderVersionPtr m_version;
-};
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
deleted file mode 100644
index b0c9736a..00000000
--- a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LiteLoaderVersionList.h"
-#include <minecraft/onesix/OneSixVersionFormat.h>
-#include "Env.h"
-#include "net/URLConstants.h"
-#include "Exception.h"
-
-#include <QtXml>
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonParseError>
-
-#include <QtAlgorithms>
-
-#include <QtNetwork>
-
-LiteLoaderVersionList::LiteLoaderVersionList(QObject *parent) : BaseVersionList(parent)
-{
-}
-
-Task *LiteLoaderVersionList::getLoadTask()
-{
-	return new LLListLoadTask(this);
-}
-
-bool LiteLoaderVersionList::isLoaded()
-{
-	return m_loaded;
-}
-
-const BaseVersionPtr LiteLoaderVersionList::at(int i) const
-{
-	return m_vlist.at(i);
-}
-
-int LiteLoaderVersionList::count() const
-{
-	return m_vlist.count();
-}
-
-static bool cmpVersions(BaseVersionPtr first, BaseVersionPtr second)
-{
-	auto left = std::dynamic_pointer_cast<LiteLoaderVersion>(first);
-	auto right = std::dynamic_pointer_cast<LiteLoaderVersion>(second);
-	return left->timestamp > right->timestamp;
-}
-
-void LiteLoaderVersionList::sortVersions()
-{
-	beginResetModel();
-	std::sort(m_vlist.begin(), m_vlist.end(), cmpVersions);
-	endResetModel();
-}
-
-QVariant LiteLoaderVersionList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (index.row() > count())
-		return QVariant();
-
-	auto version = std::dynamic_pointer_cast<LiteLoaderVersion>(m_vlist[index.row()]);
-	switch (role)
-	{
-	case VersionPointerRole:
-		return qVariantFromValue(m_vlist[index.row()]);
-
-	case VersionRole:
-		return version->name();
-
-	case VersionIdRole:
-		return version->descriptor();
-
-	case ParentGameVersionRole:
-		return version->mcVersion;
-
-	case RecommendedRole:
-		return version->isLatest;
-
-	default:
-		return QVariant();
-	}
-}
-
-QList<BaseVersionList::ModelRoles> LiteLoaderVersionList::providesRoles()
-{
-	return {VersionPointerRole, VersionRole, VersionIdRole, ParentGameVersionRole, RecommendedRole};
-}
-
-BaseVersionPtr LiteLoaderVersionList::getLatestStable() const
-{
-	for (int i = 0; i < m_vlist.length(); i++)
-	{
-		auto ver = std::dynamic_pointer_cast<LiteLoaderVersion>(m_vlist.at(i));
-		if (ver->isLatest)
-		{
-			return m_vlist.at(i);
-		}
-	}
-	return BaseVersionPtr();
-}
-
-void LiteLoaderVersionList::updateListData(QList<BaseVersionPtr> versions)
-{
-	beginResetModel();
-	m_vlist = versions;
-	m_loaded = true;
-	std::sort(m_vlist.begin(), m_vlist.end(), cmpVersions);
-	endResetModel();
-}
-
-LLListLoadTask::LLListLoadTask(LiteLoaderVersionList *vlist)
-{
-	m_list = vlist;
-}
-
-LLListLoadTask::~LLListLoadTask()
-{
-}
-
-void LLListLoadTask::executeTask()
-{
-	setStatus(tr("Loading LiteLoader version list..."));
-	auto job = new NetJob("Version index");
-	// we do not care if the version is stale or not.
-	auto liteloaderEntry = ENV.metacache()->resolveEntry("liteloader", "versions.json");
-
-	// verify by poking the server.
-	liteloaderEntry->setStale(true);
-
-	job->addNetAction(listDownload = CacheDownload::make(QUrl(URLConstants::LITELOADER_URL),
-														 liteloaderEntry));
-
-	connect(listDownload.get(), SIGNAL(failed(int)), SLOT(listFailed()));
-
-	listJob.reset(job);
-	connect(listJob.get(), SIGNAL(succeeded()), SLOT(listDownloaded()));
-	connect(listJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	listJob->start();
-}
-
-void LLListLoadTask::listFailed()
-{
-	emitFailed("Failed to load LiteLoader version list.");
-	return;
-}
-
-void LLListLoadTask::listDownloaded()
-{
-	QByteArray data;
-	{
-		auto dlJob = listDownload;
-		auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
-		QFile listFile(filename);
-		if (!listFile.open(QIODevice::ReadOnly))
-		{
-			emitFailed("Failed to open the LiteLoader version list.");
-			return;
-		}
-		data = listFile.readAll();
-		listFile.close();
-		dlJob.reset();
-	}
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		emitFailed("Error parsing version list JSON:" + jsonError.errorString());
-		return;
-	}
-
-	if (!jsonDoc.isObject())
-	{
-		emitFailed("Error parsing version list JSON: jsonDoc is not an object");
-		return;
-	}
-
-	const QJsonObject root = jsonDoc.object();
-
-	// Now, get the array of versions.
-	if (!root.value("versions").isObject())
-	{
-		emitFailed("Error parsing version list JSON: missing 'versions' object");
-		return;
-	}
-
-	auto meta = root.value("meta").toObject();
-	QString description = meta.value("description").toString(tr("This is a lightweight loader for mods that don't change game mechanics."));
-	QString defaultUrl = meta.value("url").toString("http://dl.liteloader.com");
-	QString authors = meta.value("authors").toString("Mumfrey");
-	auto versions = root.value("versions").toObject();
-
-	QList<BaseVersionPtr> tempList;
-	for (auto vIt = versions.begin(); vIt != versions.end(); ++vIt)
-	{
-		const QString mcVersion = vIt.key();
-		QString latest;
-		const QJsonObject artefacts = vIt.value()
-										  .toObject()
-										  .value("artefacts")
-										  .toObject()
-										  .value("com.mumfrey:liteloader")
-										  .toObject();
-		QList<BaseVersionPtr> perMcVersionList;
-		for (auto aIt = artefacts.begin(); aIt != artefacts.end(); ++aIt)
-		{
-			const QString identifier = aIt.key();
-			const QJsonObject artefact = aIt.value().toObject();
-			if (identifier == "latest")
-			{
-				latest = artefact.value("version").toString();
-				continue;
-			}
-			LiteLoaderVersionPtr version(new LiteLoaderVersion());
-			version->version = artefact.value("version").toString();
-			version->file = artefact.value("file").toString();
-			version->mcVersion = mcVersion;
-			version->md5 = artefact.value("md5").toString();
-			version->timestamp = artefact.value("timestamp").toString().toInt();
-			version->tweakClass = artefact.value("tweakClass").toString();
-			version->authors = authors;
-			version->description = description;
-			version->defaultUrl = defaultUrl;
-			const QJsonArray libs = artefact.value("libraries").toArray();
-			for (auto lIt = libs.begin(); lIt != libs.end(); ++lIt)
-			{
-				auto libobject = (*lIt).toObject();
-				try
-				{
-					auto lib = OneSixVersionFormat::libraryFromJson(libobject, "versions.json");
-					// hack to make liteloader 1.7.10_00 work
-					if(lib->rawName() == GradleSpecifier("org.ow2.asm:asm-all:5.0.3"))
-					{
-						lib->setRepositoryURL("http://repo.maven.apache.org/maven2/");
-					}
-					version->libraries.append(lib);
-				}
-				catch (Exception &e)
-				{
-					qCritical() << "Couldn't read JSON object:";
-					continue;
-				}
-			}
-			perMcVersionList.append(version);
-		}
-		for (auto version : perMcVersionList)
-		{
-			auto v = std::dynamic_pointer_cast<LiteLoaderVersion>(version);
-			v->isLatest = v->version == latest;
-		}
-		tempList.append(perMcVersionList);
-	}
-	m_list->updateListData(tempList);
-
-	emitSucceeded();
-}
diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h b/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h
deleted file mode 100644
index 1dba4b6a..00000000
--- a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-
-#include <QString>
-#include <QStringList>
-#include "BaseVersion.h"
-#include "BaseVersionList.h"
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-#include <minecraft/Library.h>
-
-#include "multimc_logic_export.h"
-
-class LLListLoadTask;
-class QNetworkReply;
-
-class LiteLoaderVersion : public BaseVersion
-{
-public:
-	QString descriptor() override
-	{
-		if (isLatest)
-		{
-			return QObject::tr("Latest");
-		}
-		return QString();
-	}
-	QString typeString() const override
-	{
-		return mcVersion;
-	}
-	QString name() override
-	{
-		return version;
-	}
-
-	// important info
-	QString version;
-	QString file;
-	QString mcVersion;
-	QString md5;
-	int timestamp;
-	bool isLatest;
-	QString tweakClass;
-	QList<LibraryPtr> libraries;
-
-	// meta
-	QString defaultUrl;
-	QString description;
-	QString authors;
-};
-typedef std::shared_ptr<LiteLoaderVersion> LiteLoaderVersionPtr;
-
-class MULTIMC_LOGIC_EXPORT LiteLoaderVersionList : public BaseVersionList
-{
-	Q_OBJECT
-public:
-	friend class LLListLoadTask;
-
-	explicit LiteLoaderVersionList(QObject *parent = 0);
-
-	virtual Task *getLoadTask();
-	virtual bool isLoaded();
-	virtual const BaseVersionPtr at(int i) const;
-	virtual int count() const;
-	virtual void sortVersions();
-    virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
-    virtual QList< ModelRoles > providesRoles();
-
-	virtual BaseVersionPtr getLatestStable() const;
-
-protected:
-	QList<BaseVersionPtr> m_vlist;
-
-	bool m_loaded = false;
-
-protected
-slots:
-	virtual void updateListData(QList<BaseVersionPtr> versions);
-};
-
-class LLListLoadTask : public Task
-{
-	Q_OBJECT
-
-public:
-	explicit LLListLoadTask(LiteLoaderVersionList *vlist);
-	~LLListLoadTask();
-
-	virtual void executeTask();
-
-protected
-slots:
-	void listDownloaded();
-	void listFailed();
-
-protected:
-	NetJobPtr listJob;
-	CacheDownloadPtr listDownload;
-	LiteLoaderVersionList *m_list;
-};
-
-Q_DECLARE_METATYPE(LiteLoaderVersionPtr)
diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.cpp b/libraries/logic/minecraft/onesix/OneSixInstance.cpp
deleted file mode 100644
index 258e26c5..00000000
--- a/libraries/logic/minecraft/onesix/OneSixInstance.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QDebug>
-#include <Env.h>
-
-#include "OneSixInstance.h"
-#include "OneSixUpdate.h"
-#include "OneSixProfileStrategy.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/VersionBuildError.h"
-#include "launch/LaunchTask.h"
-#include "launch/steps/PreLaunchCommand.h"
-#include "launch/steps/Update.h"
-#include "launch/steps/LaunchMinecraft.h"
-#include "launch/steps/PostLaunchCommand.h"
-#include "launch/steps/TextPrint.h"
-#include "launch/steps/ModMinecraftJar.h"
-#include "launch/steps/CheckJava.h"
-#include "MMCZip.h"
-
-#include "minecraft/AssetsUtils.h"
-#include "minecraft/WorldList.h"
-#include <FileSystem.h>
-
-OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
-	: MinecraftInstance(globalSettings, settings, rootDir)
-{
-	m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
-}
-
-void OneSixInstance::init()
-{
-	createProfile();
-}
-
-void OneSixInstance::createProfile()
-{
-	m_profile.reset(new MinecraftProfile(new OneSixProfileStrategy(this)));
-}
-
-QSet<QString> OneSixInstance::traits()
-{
-	auto version = getMinecraftProfile();
-	if (!version)
-	{
-		return {"version-incomplete"};
-	}
-	else
-	{
-		return version->getTraits();
-	}
-}
-
-std::shared_ptr<Task> OneSixInstance::createUpdateTask()
-{
-	return std::shared_ptr<Task>(new OneSixUpdate(this));
-}
-
-QString replaceTokensIn(QString text, QMap<QString, QString> with)
-{
-	QString result;
-	QRegExp token_regexp("\\$\\{(.+)\\}");
-	token_regexp.setMinimal(true);
-	QStringList list;
-	int tail = 0;
-	int head = 0;
-	while ((head = token_regexp.indexIn(text, head)) != -1)
-	{
-		result.append(text.mid(tail, head - tail));
-		QString key = token_regexp.cap(1);
-		auto iter = with.find(key);
-		if (iter != with.end())
-		{
-			result.append(*iter);
-		}
-		head += token_regexp.matchedLength();
-		tail = head;
-	}
-	result.append(text.mid(tail));
-	return result;
-}
-
-QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session)
-{
-	QString args_pattern = m_profile->getMinecraftArguments();
-	for (auto tweaker : m_profile->getTweakers())
-	{
-		args_pattern += " --tweakClass " + tweaker;
-	}
-
-	QMap<QString, QString> token_mapping;
-	// yggdrasil!
-	token_mapping["auth_username"] = session->username;
-	token_mapping["auth_session"] = session->session;
-	token_mapping["auth_access_token"] = session->access_token;
-	token_mapping["auth_player_name"] = session->player_name;
-	token_mapping["auth_uuid"] = session->uuid;
-
-	// blatant self-promotion.
-	token_mapping["profile_name"] = token_mapping["version_name"] = "MultiMC5";
-	if(m_profile->isVanilla())
-	{
-		token_mapping["version_type"] = m_profile->getMinecraftVersionType();
-	}
-	else
-	{
-		token_mapping["version_type"] = "custom";
-	}
-
-	QString absRootDir = QDir(minecraftRoot()).absolutePath();
-	token_mapping["game_directory"] = absRootDir;
-	QString absAssetsDir = QDir("assets/").absolutePath();
-	auto assets = m_profile->getMinecraftAssets();
-	token_mapping["game_assets"] = AssetsUtils::reconstructAssets(assets->id).absolutePath();
-
-	token_mapping["user_properties"] = session->serializeUserProperties();
-	token_mapping["user_type"] = session->user_type;
-
-	// 1.7.3+ assets tokens
-	token_mapping["assets_root"] = absAssetsDir;
-	token_mapping["assets_index_name"] = assets->id;
-
-	QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts);
-	for (int i = 0; i < parts.length(); i++)
-	{
-		parts[i] = replaceTokensIn(parts[i], token_mapping);
-	}
-	return parts;
-}
-
-QString OneSixInstance::createLaunchScript(AuthSessionPtr session)
-{
-	QString launchScript;
-
-	if (!m_profile)
-		return nullptr;
-
-	for(auto & mod: loaderModList()->allMods())
-	{
-		if(!mod.enabled())
-			continue;
-		if(mod.type() == Mod::MOD_FOLDER)
-			continue;
-		// TODO: proper implementation would need to descend into folders.
-
-		launchScript += "mod " + mod.filename().completeBaseName()  + "\n";;
-	}
-
-	for(auto & coremod: coreModList()->allMods())
-	{
-		if(!coremod.enabled())
-			continue;
-		if(coremod.type() == Mod::MOD_FOLDER)
-			continue;
-		// TODO: proper implementation would need to descend into folders.
-
-		launchScript += "coremod " + coremod.filename().completeBaseName()  + "\n";;
-	}
-
-	for(auto & jarmod: m_profile->getJarMods())
-	{
-		launchScript += "jarmod " + jarmod->originalName + " (" + jarmod->name + ")\n";
-	}
-
-	auto mainClass = m_profile->getMainClass();
-	if (!mainClass.isEmpty())
-	{
-		launchScript += "mainClass " + mainClass + "\n";
-	}
-	auto appletClass = m_profile->getAppletClass();
-	if (!appletClass.isEmpty())
-	{
-		launchScript += "appletClass " + appletClass + "\n";
-	}
-
-	// generic minecraft params
-	for (auto param : processMinecraftArgs(session))
-	{
-		launchScript += "param " + param + "\n";
-	}
-
-	// window size, title and state, legacy
-	{
-		QString windowParams;
-		if (settings()->get("LaunchMaximized").toBool())
-			windowParams = "max";
-		else
-			windowParams = QString("%1x%2")
-							   .arg(settings()->get("MinecraftWinWidth").toInt())
-							   .arg(settings()->get("MinecraftWinHeight").toInt());
-		launchScript += "windowTitle " + windowTitle() + "\n";
-		launchScript += "windowParams " + windowParams + "\n";
-	}
-
-	// legacy auth
-	{
-		launchScript += "userName " + session->player_name + "\n";
-		launchScript += "sessionId " + session->session + "\n";
-	}
-
-	// libraries and class path.
-	{
-		auto libs = m_profile->getLibraries();
-
-		QStringList jar, native, native32, native64;
-		for (auto lib : libs)
-		{
-			lib->getApplicableFiles(currentSystem, jar, native, native32, native64);
-		}
-		for(auto file: jar)
-		{
-			launchScript += "cp " + file + "\n";
-		}
-		for(auto file: native)
-		{
-			launchScript += "ext " + file + "\n";
-		}
-		for(auto file: native32)
-		{
-			launchScript += "ext32 " + file + "\n";
-		}
-		for(auto file: native64)
-		{
-			launchScript += "ext64 " + file + "\n";
-		}
-		QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/"));
-		launchScript += "natives " + natives_dir.absolutePath() + "\n";
-		auto jarMods = getJarMods();
-		if (!jarMods.isEmpty())
-		{
-			launchScript += "cp " + QDir(instanceRoot()).absoluteFilePath("minecraft.jar") + "\n";
-		}
-		else
-		{
-			QString relpath = m_profile->getMinecraftVersion() + "/" + m_profile->getMinecraftVersion() + ".jar";
-			launchScript += "cp " + versionsPath().absoluteFilePath(relpath) + "\n";
-		}
-	}
-
-	// traits. including legacyLaunch and others ;)
-	for (auto trait : m_profile->getTraits())
-	{
-		launchScript += "traits " + trait + "\n";
-	}
-	launchScript += "launcher onesix\n";
-	return launchScript;
-}
-
-std::shared_ptr<LaunchTask> OneSixInstance::createLaunchTask(AuthSessionPtr session)
-{
-	auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
-	auto pptr = process.get();
-
-	// print a header
-	{
-		process->appendStep(std::make_shared<TextPrint>(pptr, "Minecraft folder is:\n" + minecraftRoot() + "\n\n", MessageLevel::MultiMC));
-	}
-	{
-		auto step = std::make_shared<CheckJava>(pptr);
-		process->appendStep(step);
-	}
-	// run pre-launch command if that's needed
-	if(getPreLaunchCommand().size())
-	{
-		auto step = std::make_shared<PreLaunchCommand>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		process->appendStep(step);
-	}
-	// if we aren't in offline mode,.
-	if(session->status != AuthSession::PlayableOffline)
-	{
-		process->appendStep(std::make_shared<Update>(pptr));
-	}
-	// if there are any jar mods
-	if(getJarMods().size())
-	{
-		auto step = std::make_shared<ModMinecraftJar>(pptr);
-		process->appendStep(step);
-	}
-	// actually launch the game
-	{
-		auto step = std::make_shared<LaunchMinecraft>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		step->setAuthSession(session);
-		process->appendStep(step);
-	}
-	// run post-exit command if that's needed
-	if(getPostExitCommand().size())
-	{
-		auto step = std::make_shared<PostLaunchCommand>(pptr);
-		step->setWorkingDirectory(minecraftRoot());
-		process->appendStep(step);
-	}
-	if (session)
-	{
-		process->setCensorFilter(createCensorFilterFromSession(session));
-	}
-	return process;
-}
-
-std::shared_ptr<Task> OneSixInstance::createJarModdingTask()
-{
-	class JarModTask : public Task
-	{
-	public:
-		explicit JarModTask(std::shared_ptr<OneSixInstance> inst) : Task(nullptr), m_inst(inst)
-		{
-		}
-		virtual void executeTask()
-		{
-			auto profile = m_inst->getMinecraftProfile();
-			// nuke obsolete stripped jar(s) if needed
-			QString version_id = profile->getMinecraftVersion();
-			QString strippedPath = version_id + "/" + version_id + "-stripped.jar";
-			QFile strippedJar(strippedPath);
-			if(strippedJar.exists())
-			{
-				strippedJar.remove();
-			}
-			auto tempJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("temp.jar");
-			QFile tempJar(tempJarPath);
-			if(tempJar.exists())
-			{
-				tempJar.remove();
-			}
-			auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("minecraft.jar");
-			QFile finalJar(finalJarPath);
-			if(finalJar.exists())
-			{
-				if(!finalJar.remove())
-				{
-					emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
-					return;
-				}
-			}
-
-			// create temporary modded jar, if needed
-			auto jarMods = m_inst->getJarMods();
-			if(jarMods.size())
-			{
-				auto sourceJarPath = m_inst->versionsPath().absoluteFilePath(version_id + "/" + version_id + ".jar");
-				QString localPath = version_id + "/" + version_id + ".jar";
-				auto metacache = ENV.metacache();
-				auto entry = metacache->resolveEntry("versions", localPath);
-				QString fullJarPath = entry->getFullPath();
-				if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
-				{
-					emitFailed(tr("Failed to create the custom Minecraft jar file."));
-					return;
-				}
-			}
-			emitSucceeded();
-		}
-		std::shared_ptr<OneSixInstance> m_inst;
-	};
-	return std::make_shared<JarModTask>(std::dynamic_pointer_cast<OneSixInstance>(shared_from_this()));
-}
-
-void OneSixInstance::cleanupAfterRun()
-{
-	QString target_dir = FS::PathCombine(instanceRoot(), "natives/");
-	QDir dir(target_dir);
-	dir.removeRecursively();
-}
-
-std::shared_ptr<ModList> OneSixInstance::loaderModList() const
-{
-	if (!m_loader_mod_list)
-	{
-		m_loader_mod_list.reset(new ModList(loaderModsDir()));
-	}
-	m_loader_mod_list->update();
-	return m_loader_mod_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::coreModList() const
-{
-	if (!m_core_mod_list)
-	{
-		m_core_mod_list.reset(new ModList(coreModsDir()));
-	}
-	m_core_mod_list->update();
-	return m_core_mod_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::resourcePackList() const
-{
-	if (!m_resource_pack_list)
-	{
-		m_resource_pack_list.reset(new ModList(resourcePacksDir()));
-	}
-	m_resource_pack_list->update();
-	return m_resource_pack_list;
-}
-
-std::shared_ptr<ModList> OneSixInstance::texturePackList() const
-{
-	if (!m_texture_pack_list)
-	{
-		m_texture_pack_list.reset(new ModList(texturePacksDir()));
-	}
-	m_texture_pack_list->update();
-	return m_texture_pack_list;
-}
-
-std::shared_ptr<WorldList> OneSixInstance::worldList() const
-{
-	if (!m_world_list)
-	{
-		m_world_list.reset(new WorldList(worldDir()));
-	}
-	return m_world_list;
-}
-
-bool OneSixInstance::setIntendedVersionId(QString version)
-{
-	settings()->set("IntendedVersion", version);
-	if(getMinecraftProfile())
-	{
-		clearProfile();
-	}
-	emit propertiesChanged(this);
-	return true;
-}
-
-QList< Mod > OneSixInstance::getJarMods() const
-{
-	QList<Mod> mods;
-	for (auto jarmod : m_profile->getJarMods())
-	{
-		QString filePath = jarmodsPath().absoluteFilePath(jarmod->name);
-		mods.push_back(Mod(QFileInfo(filePath)));
-	}
-	return mods;
-}
-
-
-QString OneSixInstance::intendedVersionId() const
-{
-	return settings()->get("IntendedVersion").toString();
-}
-
-void OneSixInstance::setShouldUpdate(bool)
-{
-}
-
-bool OneSixInstance::shouldUpdate() const
-{
-	return true;
-}
-
-QString OneSixInstance::currentVersionId() const
-{
-	return intendedVersionId();
-}
-
-void OneSixInstance::reloadProfile()
-{
-	m_profile->reload();
-	auto severity = m_profile->getProblemSeverity();
-	if(severity == ProblemSeverity::PROBLEM_ERROR)
-	{
-		setFlag(VersionBrokenFlag);
-	}
-	else
-	{
-		unsetFlag(VersionBrokenFlag);
-	}
-	emit versionReloaded();
-}
-
-void OneSixInstance::clearProfile()
-{
-	m_profile->clear();
-	emit versionReloaded();
-}
-
-std::shared_ptr<MinecraftProfile> OneSixInstance::getMinecraftProfile() const
-{
-	return m_profile;
-}
-
-QDir OneSixInstance::librariesPath() const
-{
-	return QDir::current().absoluteFilePath("libraries");
-}
-
-QDir OneSixInstance::jarmodsPath() const
-{
-	return QDir(jarModsDir());
-}
-
-QDir OneSixInstance::versionsPath() const
-{
-	return QDir::current().absoluteFilePath("versions");
-}
-
-bool OneSixInstance::providesVersionFile() const
-{
-	return false;
-}
-
-bool OneSixInstance::reload()
-{
-	if (BaseInstance::reload())
-	{
-		try
-		{
-			reloadProfile();
-			return true;
-		}
-		catch (...)
-		{
-			return false;
-		}
-	}
-	return false;
-}
-
-QString OneSixInstance::loaderModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "mods");
-}
-
-QString OneSixInstance::coreModsDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "coremods");
-}
-
-QString OneSixInstance::resourcePacksDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "resourcepacks");
-}
-
-QString OneSixInstance::texturePacksDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "texturepacks");
-}
-
-QString OneSixInstance::instanceConfigFolder() const
-{
-	return FS::PathCombine(minecraftRoot(), "config");
-}
-
-QString OneSixInstance::jarModsDir() const
-{
-	return FS::PathCombine(instanceRoot(), "jarmods");
-}
-
-QString OneSixInstance::libDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "lib");
-}
-
-QString OneSixInstance::worldDir() const
-{
-	return FS::PathCombine(minecraftRoot(), "saves");
-}
-
-QStringList OneSixInstance::extraArguments() const
-{
-	auto list = BaseInstance::extraArguments();
-	auto version = getMinecraftProfile();
-	if (!version)
-		return list;
-	auto jarMods = getJarMods();
-	if (!jarMods.isEmpty())
-	{
-		list.append({"-Dfml.ignoreInvalidMinecraftCertificates=true",
-					 "-Dfml.ignorePatchDiscrepancies=true"});
-	}
-	return list;
-}
-
-std::shared_ptr<OneSixInstance> OneSixInstance::getSharedPtr()
-{
-	return std::dynamic_pointer_cast<OneSixInstance>(BaseInstance::getSharedPtr());
-}
-
-QString OneSixInstance::typeName() const
-{
-	return tr("OneSix");
-}
diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.h b/libraries/logic/minecraft/onesix/OneSixInstance.h
deleted file mode 100644
index 2dfab48c..00000000
--- a/libraries/logic/minecraft/onesix/OneSixInstance.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "minecraft/MinecraftInstance.h"
-
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/ModList.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT OneSixInstance : public MinecraftInstance
-{
-	Q_OBJECT
-public:
-	explicit OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-	virtual ~OneSixInstance(){};
-
-	virtual void init() override;
-
-	//////  Mod Lists  //////
-	std::shared_ptr<ModList> loaderModList() const;
-	std::shared_ptr<ModList> coreModList() const;
-	std::shared_ptr<ModList> resourcePackList() const override;
-	std::shared_ptr<ModList> texturePackList() const override;
-	std::shared_ptr<WorldList> worldList() const override;
-	virtual QList<Mod> getJarMods() const override;
-	virtual void createProfile();
-
-	virtual QSet<QString> traits() override;
-
-	////// Directories and files //////
-	QString jarModsDir() const;
-	QString resourcePacksDir() const;
-	QString texturePacksDir() const;
-	QString loaderModsDir() const;
-	QString coreModsDir() const;
-	QString libDir() const;
-	QString worldDir() const;
-	virtual QString instanceConfigFolder() const override;
-
-	virtual std::shared_ptr<Task> createUpdateTask() override;
-	virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override;
-	virtual std::shared_ptr<Task> createJarModdingTask() override;
-
-	virtual QString createLaunchScript(AuthSessionPtr session) override;
-
-	virtual void cleanupAfterRun() override;
-
-	virtual QString intendedVersionId() const override;
-	virtual bool setIntendedVersionId(QString version) override;
-
-	virtual QString currentVersionId() const override;
-
-	virtual bool shouldUpdate() const override;
-	virtual void setShouldUpdate(bool val) override;
-
-	/**
-	 * reload the profile, including version json files.
-	 *
-	 * throws various exceptions :3
-	 */
-	void reloadProfile();
-
-	/// clears all version information in preparation for an update
-	void clearProfile();
-
-	/// get the current full version info
-	std::shared_ptr<MinecraftProfile> getMinecraftProfile() const;
-
-	virtual QDir jarmodsPath() const;
-	virtual QDir librariesPath() const;
-	virtual QDir versionsPath() const;
-	virtual bool providesVersionFile() const;
-
-	bool reload() override;
-
-	virtual QStringList extraArguments() const override;
-
-	std::shared_ptr<OneSixInstance> getSharedPtr();
-
-	virtual QString typeName() const override;
-
-	bool canExport() const override
-	{
-		return true;
-	}
-
-signals:
-	void versionReloaded();
-
-private:
-	QStringList processMinecraftArgs(AuthSessionPtr account);
-
-protected:
-	std::shared_ptr<MinecraftProfile> m_profile;
-	mutable std::shared_ptr<ModList> m_loader_mod_list;
-	mutable std::shared_ptr<ModList> m_core_mod_list;
-	mutable std::shared_ptr<ModList> m_resource_pack_list;
-	mutable std::shared_ptr<ModList> m_texture_pack_list;
-	mutable std::shared_ptr<WorldList> m_world_list;
-};
-
-Q_DECLARE_METATYPE(std::shared_ptr<OneSixInstance>)
diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp
deleted file mode 100644
index af42286d..00000000
--- a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-#include "OneSixProfileStrategy.h"
-#include "OneSixInstance.h"
-#include "OneSixVersionFormat.h"
-
-#include "minecraft/VersionBuildError.h"
-#include "minecraft/MinecraftVersionList.h"
-#include "Env.h"
-#include <FileSystem.h>
-
-#include <QDir>
-#include <QUuid>
-#include <QJsonDocument>
-#include <QJsonArray>
-
-OneSixProfileStrategy::OneSixProfileStrategy(OneSixInstance* instance)
-{
-	m_instance = instance;
-}
-
-void OneSixProfileStrategy::upgradeDeprecatedFiles()
-{
-	auto versionJsonPath = FS::PathCombine(m_instance->instanceRoot(), "version.json");
-	auto customJsonPath = FS::PathCombine(m_instance->instanceRoot(), "custom.json");
-	auto mcJson = FS::PathCombine(m_instance->instanceRoot(), "patches" , "net.minecraft.json");
-
-	QString sourceFile;
-	QString renameFile;
-
-	// convert old crap.
-	if(QFile::exists(customJsonPath))
-	{
-		sourceFile = customJsonPath;
-		renameFile = versionJsonPath;
-	}
-	else if(QFile::exists(versionJsonPath))
-	{
-		sourceFile = versionJsonPath;
-	}
-	if(!sourceFile.isEmpty() && !QFile::exists(mcJson))
-	{
-		if(!FS::ensureFilePathExists(mcJson))
-		{
-			qWarning() << "Couldn't create patches folder for" << m_instance->name();
-			return;
-		}
-		if(!renameFile.isEmpty() && QFile::exists(renameFile))
-		{
-			if(!QFile::rename(renameFile, renameFile + ".old"))
-			{
-				qWarning() << "Couldn't rename" << renameFile << "to" << renameFile + ".old" << "in" << m_instance->name();
-				return;
-			}
-		}
-		auto file = ProfileUtils::parseJsonFile(QFileInfo(sourceFile), false);
-		ProfileUtils::removeLwjglFromPatch(file);
-		file->fileId = "net.minecraft";
-		file->version = file->minecraftVersion;
-		file->name = "Minecraft";
-		auto data = OneSixVersionFormat::versionFileToJson(file, false).toJson();
-		QSaveFile newPatchFile(mcJson);
-		if(!newPatchFile.open(QIODevice::WriteOnly))
-		{
-			newPatchFile.cancelWriting();
-			qWarning() << "Couldn't open main patch for writing in" << m_instance->name();
-			return;
-		}
-		newPatchFile.write(data);
-		if(!newPatchFile.commit())
-		{
-			qWarning() << "Couldn't save main patch in" << m_instance->name();
-			return;
-		}
-		if(!QFile::rename(sourceFile, sourceFile + ".old"))
-		{
-			qWarning() << "Couldn't rename" << sourceFile << "to" << sourceFile + ".old" << "in" << m_instance->name();
-			return;
-		}
-	}
-}
-
-void OneSixProfileStrategy::loadDefaultBuiltinPatches()
-{
-	{
-		auto mcJson = FS::PathCombine(m_instance->instanceRoot(), "patches" , "net.minecraft.json");
-		// load up the base minecraft patch
-		ProfilePatchPtr minecraftPatch;
-		if(QFile::exists(mcJson))
-		{
-			auto file = ProfileUtils::parseJsonFile(QFileInfo(mcJson), false);
-			if(file->version.isEmpty())
-			{
-				file->version = m_instance->intendedVersionId();
-			}
-			file->setVanilla(false);
-			file->setRevertible(true);
-			minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(file);
-		}
-		else
-		{
-			auto mcversion = ENV.getVersion("net.minecraft", m_instance->intendedVersionId());
-			minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(mcversion);
-		}
-		if (!minecraftPatch)
-		{
-			throw VersionIncomplete("net.minecraft");
-		}
-		minecraftPatch->setOrder(-2);
-		profile->appendPatch(minecraftPatch);
-	}
-
-	{
-		auto lwjglJson = FS::PathCombine(m_instance->instanceRoot(), "patches" , "org.lwjgl.json");
-		ProfilePatchPtr lwjglPatch;
-		if(QFile::exists(lwjglJson))
-		{
-			auto file = ProfileUtils::parseJsonFile(QFileInfo(lwjglJson), false);
-			file->setVanilla(false);
-			file->setRevertible(true);
-			lwjglPatch = std::dynamic_pointer_cast<ProfilePatch>(file);
-		}
-		else
-		{
-			// NOTE: this is obviously fake, is fixed in unstable.
-			QResource LWJGL(":/versions/LWJGL/2.9.1.json");
-			auto lwjgl = ProfileUtils::parseJsonFile(LWJGL.absoluteFilePath(), false);
-			lwjgl->setVanilla(true);
-			lwjgl->setCustomizable(true);
-			lwjglPatch = std::dynamic_pointer_cast<ProfilePatch>(lwjgl);
-		}
-		if (!lwjglPatch)
-		{
-			throw VersionIncomplete("org.lwjgl");
-		}
-		lwjglPatch->setOrder(-1);
-		profile->appendPatch(lwjglPatch);
-	}
-}
-
-void OneSixProfileStrategy::loadUserPatches()
-{
-	// load all patches, put into map for ordering, apply in the right order
-	ProfileUtils::PatchOrder userOrder;
-	ProfileUtils::readOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), userOrder);
-	QDir patches(FS::PathCombine(m_instance->instanceRoot(),"patches"));
-	QSet<QString> seen_extra;
-
-	// first, load things by sort order.
-	for (auto id : userOrder)
-	{
-		// ignore builtins
-		if (id == "net.minecraft")
-			continue;
-		if (id == "org.lwjgl")
-			continue;
-		// parse the file
-		QString filename = patches.absoluteFilePath(id + ".json");
-		QFileInfo finfo(filename);
-		if(!finfo.exists())
-		{
-			qDebug() << "Patch file " << filename << " was deleted by external means...";
-			continue;
-		}
-		qDebug() << "Reading" << filename << "by user order";
-		VersionFilePtr file = ProfileUtils::parseJsonFile(finfo, false);
-		// sanity check. prevent tampering with files.
-		if (file->fileId != id)
-		{
-			file->addProblem(PROBLEM_WARNING, QObject::tr("load id %1 does not match internal id %2").arg(id, file->fileId));
-			seen_extra.insert(file->fileId);
-		}
-		file->setRemovable(true);
-		file->setMovable(true);
-		profile->appendPatch(file);
-	}
-	// now load the rest by internal preference.
-	QMultiMap<int, VersionFilePtr> files;
-	for (auto info : patches.entryInfoList(QStringList() << "*.json", QDir::Files))
-	{
-		// parse the file
-		qDebug() << "Reading" << info.fileName();
-		auto file = ProfileUtils::parseJsonFile(info, true);
-		// ignore builtins
-		if (file->fileId == "net.minecraft")
-			continue;
-		if (file->fileId == "org.lwjgl")
-			continue;
-		// do not load versions with broken IDs twice
-		if(seen_extra.contains(file->fileId))
-			continue;
-		// do not load what we already loaded in the first pass
-		if (userOrder.contains(file->fileId))
-			continue;
-		file->setRemovable(true);
-		file->setMovable(true);
-		files.insert(file->order, file);
-	}
-	QSet<int> seen;
-	for (auto order : files.keys())
-	{
-		if(seen.contains(order))
-			continue;
-		seen.insert(order);
-		const auto &values = files.values(order);
-		if(values.size() == 1)
-		{
-			profile->appendPatch(values[0]);
-			continue;
-		}
-		for(auto &file: values)
-		{
-			QStringList list;
-			for(auto &file2: values)
-			{
-				if(file != file2)
-					list.append(file2->name);
-			}
-			file->addProblem(PROBLEM_WARNING, QObject::tr("%1 has the same order as the following components:\n%2").arg(file->name, list.join(", ")));
-			profile->appendPatch(file);
-		}
-	}
-}
-
-
-void OneSixProfileStrategy::load()
-{
-	profile->clearPatches();
-
-	upgradeDeprecatedFiles();
-	loadDefaultBuiltinPatches();
-	loadUserPatches();
-}
-
-bool OneSixProfileStrategy::saveOrder(ProfileUtils::PatchOrder order)
-{
-	return ProfileUtils::writeOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), order);
-}
-
-bool OneSixProfileStrategy::resetOrder()
-{
-	return QDir(m_instance->instanceRoot()).remove("order.json");
-}
-
-bool OneSixProfileStrategy::removePatch(ProfilePatchPtr patch)
-{
-	bool ok = true;
-	// first, remove the patch file. this ensures it's not used anymore
-	auto fileName = patch->getFilename();
-	if(fileName.size())
-	{
-		QFile patchFile(fileName);
-		if(patchFile.exists() && !patchFile.remove())
-		{
-			qCritical() << "File" << fileName << "could not be removed because:" << patchFile.errorString();
-			return false;
-		}
-	}
-
-
-	auto preRemoveJarMod = [&](JarmodPtr jarMod) -> bool
-	{
-		QString fullpath = FS::PathCombine(m_instance->jarModsDir(), jarMod->name);
-		QFileInfo finfo (fullpath);
-		if(finfo.exists())
-		{
-			QFile jarModFile(fullpath);
-			if(!jarModFile.remove())
-			{
-				qCritical() << "File" << fullpath << "could not be removed because:" << jarModFile.errorString();
-				return false;
-			}
-			return true;
-		}
-		return true;
-	};
-
-	for(auto &jarmod: patch->getJarMods())
-	{
-		ok &= preRemoveJarMod(jarmod);
-	}
-	return ok;
-}
-
-bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch)
-{
-	if(patch->isCustom())
-	{
-		return false;
-	}
-
-	auto filename = FS::PathCombine(m_instance->instanceRoot(), "patches" , patch->getID() + ".json");
-	if(!FS::ensureFilePathExists(filename))
-	{
-		return false;
-	}
-	try
-	{
-		QSaveFile jsonFile(filename);
-		if(!jsonFile.open(QIODevice::WriteOnly))
-		{
-			return false;
-		}
-		auto vfile = patch->getVersionFile();
-		if(!vfile)
-		{
-			return false;
-		}
-		auto document = OneSixVersionFormat::versionFileToJson(vfile, true);
-		jsonFile.write(document.toJson());
-		if(!jsonFile.commit())
-		{
-			return false;
-		}
-		load();
-	}
-	catch (VersionIncomplete &error)
-	{
-		qDebug() << "Version was incomplete:" << error.cause();
-	}
-	catch (Exception &error)
-	{
-		qWarning() << "Version could not be loaded:" << error.cause();
-	}
-	return true;
-}
-
-bool OneSixProfileStrategy::revertPatch(ProfilePatchPtr patch)
-{
-	if(!patch->isCustom())
-	{
-		// already not custom
-		return true;
-	}
-	auto filename = patch->getFilename();
-	if(!QFile::exists(filename))
-	{
-		// already gone / not custom
-		return true;
-	}
-	// just kill the file and reload
-	bool result = QFile::remove(filename);
-	try
-	{
-		load();
-	}
-	catch (VersionIncomplete &error)
-	{
-		qDebug() << "Version was incomplete:" << error.cause();
-	}
-	catch (Exception &error)
-	{
-		qWarning() << "Version could not be loaded:" << error.cause();
-	}
-	return result;
-}
-
-bool OneSixProfileStrategy::installJarMods(QStringList filepaths)
-{
-	QString patchDir = FS::PathCombine(m_instance->instanceRoot(), "patches");
-	if(!FS::ensureFolderPathExists(patchDir))
-	{
-		return false;
-	}
-
-	if (!FS::ensureFolderPathExists(m_instance->jarModsDir()))
-	{
-		return false;
-	}
-
-	for(auto filepath:filepaths)
-	{
-		QFileInfo sourceInfo(filepath);
-		auto uuid = QUuid::createUuid();
-		QString id = uuid.toString().remove('{').remove('}');
-		QString target_filename = id + ".jar";
-		QString target_id = "org.multimc.jarmod." + id;
-		QString target_name = sourceInfo.completeBaseName() + " (jar mod)";
-		QString finalPath = FS::PathCombine(m_instance->jarModsDir(), target_filename);
-
-		QFileInfo targetInfo(finalPath);
-		if(targetInfo.exists())
-		{
-			return false;
-		}
-
-		if (!QFile::copy(sourceInfo.absoluteFilePath(),QFileInfo(finalPath).absoluteFilePath()))
-		{
-			return false;
-		}
-
-		auto f = std::make_shared<VersionFile>();
-		auto jarMod = std::make_shared<Jarmod>();
-		jarMod->name = target_filename;
-		jarMod->originalName = sourceInfo.completeBaseName();
-		f->jarMods.append(jarMod);
-		f->name = target_name;
-		f->fileId = target_id;
-		f->order = profile->getFreeOrderNumber();
-		QString patchFileName = FS::PathCombine(patchDir, target_id + ".json");
-		f->filename = patchFileName;
-		f->setMovable(true);
-		f->setRemovable(true);
-
-		QFile file(patchFileName);
-		if (!file.open(QFile::WriteOnly))
-		{
-			qCritical() << "Error opening" << file.fileName()
-						<< "for reading:" << file.errorString();
-			return false;
-		}
-		file.write(OneSixVersionFormat::versionFileToJson(f, true).toJson());
-		file.close();
-		profile->appendPatch(f);
-	}
-	profile->saveCurrentOrder();
-	profile->reapplyPatches();
-	return true;
-}
-
diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h b/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h
deleted file mode 100644
index 96c1ba7b..00000000
--- a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-#include "minecraft/ProfileStrategy.h"
-
-class OneSixInstance;
-
-class OneSixProfileStrategy : public ProfileStrategy
-{
-public:
-	OneSixProfileStrategy(OneSixInstance * instance);
-	virtual ~OneSixProfileStrategy() {};
-	virtual void load() override;
-	virtual bool resetOrder() override;
-	virtual bool saveOrder(ProfileUtils::PatchOrder order) override;
-	virtual bool installJarMods(QStringList filepaths) override;
-	virtual bool removePatch(ProfilePatchPtr patch) override;
-	virtual bool customizePatch(ProfilePatchPtr patch) override;
-	virtual bool revertPatch(ProfilePatchPtr patch) override;
-
-protected:
-	virtual void loadDefaultBuiltinPatches();
-	virtual void loadUserPatches();
-	void upgradeDeprecatedFiles();
-
-protected:
-	OneSixInstance *m_instance;
-};
diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.cpp b/libraries/logic/minecraft/onesix/OneSixUpdate.cpp
deleted file mode 100644
index 1c2cd196..00000000
--- a/libraries/logic/minecraft/onesix/OneSixUpdate.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Env.h"
-#include <minecraft/forge/ForgeXzDownload.h>
-#include "OneSixUpdate.h"
-#include "OneSixInstance.h"
-
-#include <QtNetwork>
-
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QDataStream>
-#include <JlCompress.h>
-
-#include "BaseInstance.h"
-#include "minecraft/MinecraftVersionList.h"
-#include "minecraft/MinecraftProfile.h"
-#include "minecraft/Library.h"
-#include "net/URLConstants.h"
-#include "minecraft/AssetsUtils.h"
-#include "Exception.h"
-#include "MMCZip.h"
-#include <FileSystem.h>
-
-OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
-{
-}
-
-void OneSixUpdate::executeTask()
-{
-	// Make directories
-	QDir mcDir(m_inst->minecraftRoot());
-	if (!mcDir.exists() && !mcDir.mkpath("."))
-	{
-		emitFailed(tr("Failed to create folder for minecraft binaries."));
-		return;
-	}
-
-	// Get a pointer to the version object that corresponds to the instance's version.
-	targetVersion = std::dynamic_pointer_cast<MinecraftVersion>(ENV.getVersion("net.minecraft", m_inst->intendedVersionId()));
-	if (targetVersion == nullptr)
-	{
-		// don't do anything if it was invalid
-		emitFailed(tr("The specified Minecraft version is invalid. Choose a different one."));
-		return;
-	}
-	if (m_inst->providesVersionFile() || !targetVersion->needsUpdate())
-	{
-		qDebug() << "Instance either provides a version file or doesn't need an update.";
-		jarlibStart();
-		return;
-	}
-	versionUpdateTask = std::dynamic_pointer_cast<MinecraftVersionList>(ENV.getVersionList("net.minecraft"))->createUpdateTask(m_inst->intendedVersionId());
-	if (!versionUpdateTask)
-	{
-		qDebug() << "Didn't spawn an update task.";
-		jarlibStart();
-		return;
-	}
-	connect(versionUpdateTask.get(), SIGNAL(succeeded()), SLOT(jarlibStart()));
-	connect(versionUpdateTask.get(), &NetJob::failed, this, &OneSixUpdate::versionUpdateFailed);
-	connect(versionUpdateTask.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	setStatus(tr("Getting the version files from Mojang..."));
-	versionUpdateTask->start();
-}
-
-void OneSixUpdate::versionUpdateFailed(QString reason)
-{
-	emitFailed(reason);
-}
-
-void OneSixUpdate::assetIndexStart()
-{
-	setStatus(tr("Updating assets index..."));
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	auto profile = inst->getMinecraftProfile();
-	auto assets = profile->getMinecraftAssets();
-	QUrl indexUrl = assets->url;
-	QString localPath = assets->id + ".json";
-	auto job = new NetJob(tr("Asset index for %1").arg(inst->name()));
-
-	auto metacache = ENV.metacache();
-	auto entry = metacache->resolveEntry("asset_indexes", localPath);
-	entry->setStale(true);
-	job->addNetAction(CacheDownload::make(indexUrl, entry));
-	jarlibDownloadJob.reset(job);
-
-	connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(assetIndexFinished()));
-	connect(jarlibDownloadJob.get(), &NetJob::failed, this, &OneSixUpdate::assetIndexFailed);
-	connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-
-	qDebug() << m_inst->name() << ": Starting asset index download";
-	jarlibDownloadJob->start();
-}
-
-void OneSixUpdate::assetIndexFinished()
-{
-	AssetsIndex index;
-	qDebug() << m_inst->name() << ": Finished asset index download";
-
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	auto profile = inst->getMinecraftProfile();
-	auto assets = profile->getMinecraftAssets();
-
-	QString asset_fname = "assets/indexes/" + assets->id + ".json";
-	// FIXME: this looks like a job for a generic validator based on json schema?
-	if (!AssetsUtils::loadAssetsIndexJson(assets->id, asset_fname, &index))
-	{
-		auto metacache = ENV.metacache();
-		auto entry = metacache->resolveEntry("asset_indexes", assets->id + ".json");
-		metacache->evictEntry(entry);
-		emitFailed(tr("Failed to read the assets index!"));
-	}
-
-	auto job = index.getDownloadJob();
-	if(job)
-	{
-		setStatus(tr("Getting the assets files from Mojang..."));
-		jarlibDownloadJob = job;
-		connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(assetsFinished()));
-		connect(jarlibDownloadJob.get(), &NetJob::failed, this, &OneSixUpdate::assetsFailed);
-		connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-		jarlibDownloadJob->start();
-		return;
-	}
-	assetsFinished();
-}
-
-void OneSixUpdate::assetIndexFailed(QString reason)
-{
-	qDebug() << m_inst->name() << ": Failed asset index download";
-	emitFailed(tr("Failed to download the assets index:\n%1").arg(reason));
-}
-
-void OneSixUpdate::assetsFinished()
-{
-	emitSucceeded();
-}
-
-void OneSixUpdate::assetsFailed(QString reason)
-{
-	emitFailed(tr("Failed to download assets:\n%1").arg(reason));
-}
-
-void OneSixUpdate::jarlibStart()
-{
-	setStatus(tr("Getting the library files from Mojang..."));
-	qDebug() << m_inst->name() << ": downloading libraries";
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	inst->reloadProfile();
-	if(inst->flags() & BaseInstance::VersionBrokenFlag)
-	{
-		emitFailed(tr("Failed to load the version description files - check the instance for errors."));
-		return;
-	}
-
-	// Build a list of URLs that will need to be downloaded.
-	std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
-	// minecraft.jar for this version
-	{
-		QString version_id = profile->getMinecraftVersion();
-		QString localPath = version_id + "/" + version_id + ".jar";
-		QString urlstr = profile->getMainJarUrl();
-
-		auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()));
-
-		auto metacache = ENV.metacache();
-		auto entry = metacache->resolveEntry("versions", localPath);
-		job->addNetAction(CacheDownload::make(QUrl(urlstr), entry));
-		jarlibDownloadJob.reset(job);
-	}
-
-	auto libs = profile->getLibraries();
-
-	auto metacache = ENV.metacache();
-	QList<LibraryPtr> brokenLocalLibs;
-
-	QStringList failedFiles;
-	for (auto lib : libs)
-	{
-		auto dls = lib->getDownloads(currentSystem, metacache.get(), failedFiles);
-		for(auto dl : dls)
-		{
-			jarlibDownloadJob->addNetAction(dl);
-		}
-	}
-	if (!brokenLocalLibs.empty())
-	{
-		jarlibDownloadJob.reset();
-
-		QString failed_all = failedFiles.join("\n");
-		emitFailed(tr("Some libraries marked as 'local' are missing their jar "
-					  "files:\n%1\n\nYou'll have to correct this problem manually. If this is "
-					  "an externally tracked instance, make sure to run it at least once "
-					  "outside of MultiMC.").arg(failed_all));
-		return;
-	}
-
-	connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(jarlibFinished()));
-	connect(jarlibDownloadJob.get(), &NetJob::failed, this, &OneSixUpdate::jarlibFailed);
-	connect(jarlibDownloadJob.get(), SIGNAL(progress(qint64, qint64)),
-			SIGNAL(progress(qint64, qint64)));
-
-	jarlibDownloadJob->start();
-}
-
-void OneSixUpdate::jarlibFinished()
-{
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
-
-	if (profile->hasTrait("legacyFML"))
-	{
-		fmllibsStart();
-	}
-	else
-	{
-		assetIndexStart();
-	}
-}
-
-void OneSixUpdate::jarlibFailed(QString reason)
-{
-	QStringList failed = jarlibDownloadJob->getFailedFiles();
-	QString failed_all = failed.join("\n");
-	emitFailed(
-		tr("Failed to download the following files:\n%1\n\nReason:%2\nPlease try again.").arg(failed_all, reason));
-}
-
-void OneSixUpdate::fmllibsStart()
-{
-	// Get the mod list
-	OneSixInstance *inst = (OneSixInstance *)m_inst;
-	std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
-	bool forge_present = false;
-
-	QString version = inst->intendedVersionId();
-	auto &fmlLibsMapping = g_VersionFilterData.fmlLibsMapping;
-	if (!fmlLibsMapping.contains(version))
-	{
-		assetIndexStart();
-		return;
-	}
-
-	auto &libList = fmlLibsMapping[version];
-
-	// determine if we need some libs for FML or forge
-	setStatus(tr("Checking for FML libraries..."));
-	forge_present = (profile->versionPatch("net.minecraftforge") != nullptr);
-	// we don't...
-	if (!forge_present)
-	{
-		assetIndexStart();
-		return;
-	}
-
-	// now check the lib folder inside the instance for files.
-	for (auto &lib : libList)
-	{
-		QFileInfo libInfo(FS::PathCombine(inst->libDir(), lib.filename));
-		if (libInfo.exists())
-			continue;
-		fmlLibsToProcess.append(lib);
-	}
-
-	// if everything is in place, there's nothing to do here...
-	if (fmlLibsToProcess.isEmpty())
-	{
-		assetIndexStart();
-		return;
-	}
-
-	// download missing libs to our place
-	setStatus(tr("Dowloading FML libraries..."));
-	auto dljob = new NetJob("FML libraries");
-	auto metacache = ENV.metacache();
-	for (auto &lib : fmlLibsToProcess)
-	{
-		auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-		QString urlString = lib.ours ? URLConstants::FMLLIBS_OUR_BASE_URL + lib.filename
-									 : URLConstants::FMLLIBS_FORGE_BASE_URL + lib.filename;
-		dljob->addNetAction(CacheDownload::make(QUrl(urlString), entry));
-	}
-
-	connect(dljob, SIGNAL(succeeded()), SLOT(fmllibsFinished()));
-	connect(dljob, &NetJob::failed, this, &OneSixUpdate::fmllibsFailed);
-	connect(dljob, SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
-	legacyDownloadJob.reset(dljob);
-	legacyDownloadJob->start();
-}
-
-void OneSixUpdate::fmllibsFinished()
-{
-	legacyDownloadJob.reset();
-	if (!fmlLibsToProcess.isEmpty())
-	{
-		setStatus(tr("Copying FML libraries into the instance..."));
-		OneSixInstance *inst = (OneSixInstance *)m_inst;
-		auto metacache = ENV.metacache();
-		int index = 0;
-		for (auto &lib : fmlLibsToProcess)
-		{
-			progress(index, fmlLibsToProcess.size());
-			auto entry = metacache->resolveEntry("fmllibs", lib.filename);
-			auto path = FS::PathCombine(inst->libDir(), lib.filename);
-			if (!FS::ensureFilePathExists(path))
-			{
-				emitFailed(tr("Failed creating FML library folder inside the instance."));
-				return;
-			}
-			if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->libDir(), lib.filename)))
-			{
-				emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename));
-				return;
-			}
-			index++;
-		}
-		progress(index, fmlLibsToProcess.size());
-	}
-	assetIndexStart();
-}
-
-void OneSixUpdate::fmllibsFailed(QString reason)
-{
-	emitFailed(tr("Game update failed: it was impossible to fetch the required FML libraries.\nReason:\n%1").arg(reason));
-	return;
-}
-
diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.h b/libraries/logic/minecraft/onesix/OneSixUpdate.h
deleted file mode 100644
index b5195364..00000000
--- a/libraries/logic/minecraft/onesix/OneSixUpdate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QList>
-#include <QUrl>
-
-#include "net/NetJob.h"
-#include "tasks/Task.h"
-#include "minecraft/VersionFilterData.h"
-#include <quazip.h>
-
-class MinecraftVersion;
-class OneSixInstance;
-
-class OneSixUpdate : public Task
-{
-	Q_OBJECT
-public:
-	explicit OneSixUpdate(OneSixInstance *inst, QObject *parent = 0);
-	virtual void executeTask();
-
-private
-slots:
-	void versionUpdateFailed(QString reason);
-
-	void jarlibStart();
-	void jarlibFinished();
-	void jarlibFailed(QString reason);
-
-	void fmllibsStart();
-	void fmllibsFinished();
-	void fmllibsFailed(QString reason);
-
-	void assetIndexStart();
-	void assetIndexFinished();
-	void assetIndexFailed(QString reason);
-
-	void assetsFinished();
-	void assetsFailed(QString reason);
-
-private:
-	NetJobPtr jarlibDownloadJob;
-	NetJobPtr legacyDownloadJob;
-
-	/// target version, determined during this task
-	std::shared_ptr<MinecraftVersion> targetVersion;
-	/// the task that is spawned for version updates
-	std::shared_ptr<Task> versionUpdateTask;
-
-	OneSixInstance *m_inst = nullptr;
-	QList<FMLlib> fmlLibsToProcess;
-};
diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp b/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp
deleted file mode 100644
index 541fb109..00000000
--- a/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-#include "OneSixVersionFormat.h"
-#include <Json.h>
-#include "minecraft/ParseUtils.h"
-#include <minecraft/MinecraftVersion.h>
-#include <minecraft/VersionBuildError.h>
-#include <minecraft/MojangVersionFormat.h>
-
-using namespace Json;
-
-static void readString(const QJsonObject &root, const QString &key, QString &variable)
-{
-	if (root.contains(key))
-	{
-		variable = requireString(root.value(key));
-	}
-}
-
-LibraryPtr OneSixVersionFormat::libraryFromJson(const QJsonObject &libObj, const QString &filename)
-{
-	LibraryPtr out = MojangVersionFormat::libraryFromJson(libObj, filename);
-	readString(libObj, "MMC-hint", out->m_hint);
-	readString(libObj, "MMC-absulute_url", out->m_absoluteURL);
-	readString(libObj, "MMC-absoluteUrl", out->m_absoluteURL);
-	return out;
-}
-
-QJsonObject OneSixVersionFormat::libraryToJson(Library *library)
-{
-	QJsonObject libRoot = MojangVersionFormat::libraryToJson(library);
-	if (library->m_absoluteURL.size())
-		libRoot.insert("MMC-absoluteUrl", library->m_absoluteURL);
-	if (library->m_hint.size())
-		libRoot.insert("MMC-hint", library->m_hint);
-	return libRoot;
-}
-
-VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc, const QString &filename, const bool requireOrder)
-{
-	VersionFilePtr out(new VersionFile());
-	if (doc.isEmpty() || doc.isNull())
-	{
-		throw JSONValidationError(filename + " is empty or null");
-	}
-	if (!doc.isObject())
-	{
-		throw JSONValidationError(filename + " is not an object");
-	}
-
-	QJsonObject root = doc.object();
-
-	if (requireOrder)
-	{
-		if (root.contains("order"))
-		{
-			out->order = requireInteger(root.value("order"));
-		}
-		else
-		{
-			// FIXME: evaluate if we don't want to throw exceptions here instead
-			qCritical() << filename << "doesn't contain an order field";
-		}
-	}
-
-	out->name = root.value("name").toString();
-	out->fileId = root.value("fileId").toString();
-	out->version = root.value("version").toString();
-	out->dependsOnMinecraftVersion = root.value("mcVersion").toString();
-	out->filename = filename;
-
-	MojangVersionFormat::readVersionProperties(root, out.get());
-
-	// added for legacy Minecraft window embedding, TODO: remove
-	readString(root, "appletClass", out->appletClass);
-
-	if (root.contains("+tweakers"))
-	{
-		for (auto tweakerVal : requireArray(root.value("+tweakers")))
-		{
-			out->addTweakers.append(requireString(tweakerVal));
-		}
-	}
-
-	if (root.contains("+traits"))
-	{
-		for (auto tweakerVal : requireArray(root.value("+traits")))
-		{
-			out->traits.insert(requireString(tweakerVal));
-		}
-	}
-
-	if (root.contains("+jarMods"))
-	{
-		for (auto libVal : requireArray(root.value("+jarMods")))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the jarmod
-			auto lib = OneSixVersionFormat::jarModFromJson(libObj, filename, out->name);
-			if(lib->originalName.isEmpty())
-			{
-				auto fixed = out->name;
-				fixed.remove(" (jar mod)");
-				lib->originalName = out->name;
-			}
-			// and add to jar mods
-			out->jarMods.append(lib);
-		}
-	}
-
-	auto readLibs = [&](const char * which)
-	{
-		for (auto libVal : requireArray(root.value(which)))
-		{
-			QJsonObject libObj = requireObject(libVal);
-			// parse the library
-			auto lib = libraryFromJson(libObj, filename);
-			out->libraries.append(lib);
-		}
-	};
-	bool hasPlusLibs = root.contains("+libraries");
-	bool hasLibs = root.contains("libraries");
-	if (hasPlusLibs && hasLibs)
-	{
-		out->addProblem(PROBLEM_WARNING, QObject::tr("Version file has both '+libraries' and 'libraries'. This is no longer supported."));
-		readLibs("libraries");
-		readLibs("+libraries");
-	}
-	else if (hasLibs)
-	{
-		readLibs("libraries");
-	}
-	else if(hasPlusLibs)
-	{
-		readLibs("+libraries");
-	}
-
-	/* removed features that shouldn't be used */
-	if (root.contains("tweakers"))
-	{
-		out->addProblem(PROBLEM_ERROR, QObject::tr("Version file contains unsupported element 'tweakers'"));
-	}
-	if (root.contains("-libraries"))
-	{
-		out->addProblem(PROBLEM_ERROR, QObject::tr("Version file contains unsupported element '-libraries'"));
-	}
-	if (root.contains("-tweakers"))
-	{
-		out->addProblem(PROBLEM_ERROR, QObject::tr("Version file contains unsupported element '-tweakers'"));
-	}
-	if (root.contains("-minecraftArguments"))
-	{
-		out->addProblem(PROBLEM_ERROR, QObject::tr("Version file contains unsupported element '-minecraftArguments'"));
-	}
-	if (root.contains("+minecraftArguments"))
-	{
-		out->addProblem(PROBLEM_ERROR, QObject::tr("Version file contains unsupported element '+minecraftArguments'"));
-	}
-	return out;
-}
-
-QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch, bool saveOrder)
-{
-	QJsonObject root;
-	if (saveOrder)
-	{
-		root.insert("order", patch->order);
-	}
-	writeString(root, "name", patch->name);
-	writeString(root, "fileId", patch->fileId);
-	writeString(root, "version", patch->version);
-	writeString(root, "mcVersion", patch->dependsOnMinecraftVersion);
-
-	MojangVersionFormat::writeVersionProperties(patch.get(), root);
-
-	writeString(root, "appletClass", patch->appletClass);
-	writeStringList(root, "+tweakers", patch->addTweakers);
-	writeStringList(root, "+traits", patch->traits.toList());
-	if (!patch->libraries.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->libraries)
-		{
-			array.append(OneSixVersionFormat::libraryToJson(value.get()));
-		}
-		root.insert("+libraries", array);
-	}
-	if (!patch->jarMods.isEmpty())
-	{
-		QJsonArray array;
-		for (auto value: patch->jarMods)
-		{
-			array.append(OneSixVersionFormat::jarModtoJson(value.get()));
-		}
-		root.insert("+jarMods", array);
-	}
-	// write the contents to a json document.
-	{
-		QJsonDocument out;
-		out.setObject(root);
-		return out;
-	}
-}
-
-JarmodPtr OneSixVersionFormat::jarModFromJson(const QJsonObject &libObj, const QString &filename, const QString &originalName)
-{
-	JarmodPtr out(new Jarmod());
-	if (!libObj.contains("name"))
-	{
-		throw JSONValidationError(filename +
-								  "contains a jarmod that doesn't have a 'name' field");
-	}
-	out->name = libObj.value("name").toString();
-	out->originalName = libObj.value("originalName").toString();
-	return out;
-}
-
-QJsonObject OneSixVersionFormat::jarModtoJson(Jarmod *jarmod)
-{
-	QJsonObject out;
-	writeString(out, "name", jarmod->name);
-	if(!jarmod->originalName.isEmpty())
-	{
-		writeString(out, "originalName", jarmod->originalName);
-	}
-	return out;
-}
diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.h b/libraries/logic/minecraft/onesix/OneSixVersionFormat.h
deleted file mode 100644
index 5696e79e..00000000
--- a/libraries/logic/minecraft/onesix/OneSixVersionFormat.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <minecraft/VersionFile.h>
-#include <minecraft/MinecraftProfile.h>
-#include <minecraft/Library.h>
-#include <QJsonDocument>
-
-class OneSixVersionFormat
-{
-public:
-	// version files / profile patches
-	static VersionFilePtr versionFileFromJson(const QJsonDocument &doc, const QString &filename, const bool requireOrder);
-	static QJsonDocument versionFileToJson(const VersionFilePtr &patch, bool saveOrder);
-
-	// libraries
-	static LibraryPtr libraryFromJson(const QJsonObject &libObj, const QString &filename);
-	static QJsonObject libraryToJson(Library *library);
-
-	// jar mods
-	static JarmodPtr jarModFromJson(const QJsonObject &libObj, const QString &filename, const QString &originalName);
-	static QJsonObject jarModtoJson(Jarmod * jarmod);
-};
diff --git a/libraries/logic/net/ByteArrayDownload.cpp b/libraries/logic/net/ByteArrayDownload.cpp
deleted file mode 100644
index 21990eeb..00000000
--- a/libraries/logic/net/ByteArrayDownload.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ByteArrayDownload.h"
-#include "Env.h"
-#include <QDebug>
-
-ByteArrayDownload::ByteArrayDownload(QUrl url) : NetAction()
-{
-	m_url = url;
-	m_status = Job_NotStarted;
-}
-
-void ByteArrayDownload::start()
-{
-	qDebug() << "Downloading " << m_url.toString();
-	QNetworkRequest request(m_url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->get(request);
-
-	m_reply.reset(rep);
-	connect(rep, SIGNAL(downloadProgress(qint64, qint64)),
-			SLOT(downloadProgress(qint64, qint64)));
-	connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
-}
-
-void ByteArrayDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
-
-void ByteArrayDownload::downloadError(QNetworkReply::NetworkError error)
-{
-	// error happened during download.
-	qCritical() << "Error getting URL:" << m_url.toString().toLocal8Bit()
-				 << "Network error: " << error;
-	m_status = Job_Failed;
-	m_errorString = m_reply->errorString();
-}
-
-void ByteArrayDownload::downloadFinished()
-{
-	QVariant redirect = m_reply->header(QNetworkRequest::LocationHeader);
-	QString redirectURL;
-	if(redirect.isValid())
-	{
-		redirectURL = redirect.toString();
-	}
-	// FIXME: This is a hack for https://bugreports.qt-project.org/browse/QTBUG-41061
-	else if(m_reply->hasRawHeader("Location"))
-	{
-		auto data = m_reply->rawHeader("Location");
-		if(data.size() > 2 && data[0] == '/' && data[1] == '/')
-			redirectURL = m_reply->url().scheme() + ":" + data;
-	}
-	if (!redirectURL.isEmpty())
-	{
-		m_url = QUrl(redirect.toString());
-		qDebug() << "Following redirect to " << m_url.toString();
-		start();
-		return;
-	}
-
-	// if the download succeeded
-	if (m_status != Job_Failed)
-	{
-		// nothing went wrong...
-		m_status = Job_Finished;
-		m_data = m_reply->readAll();
-		m_content_type = m_reply->header(QNetworkRequest::ContentTypeHeader).toString();
-		m_reply.reset();
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	// else the download failed
-	else
-	{
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-}
-
-void ByteArrayDownload::downloadReadyRead()
-{
-	// ~_~
-}
diff --git a/libraries/logic/net/ByteArrayDownload.h b/libraries/logic/net/ByteArrayDownload.h
deleted file mode 100644
index e2fc2911..00000000
--- a/libraries/logic/net/ByteArrayDownload.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include "NetAction.h"
-
-#include "multimc_logic_export.h"
-
-typedef std::shared_ptr<class ByteArrayDownload> ByteArrayDownloadPtr;
-class MULTIMC_LOGIC_EXPORT ByteArrayDownload : public NetAction
-{
-	Q_OBJECT
-public:
-	ByteArrayDownload(QUrl url);
-	static ByteArrayDownloadPtr make(QUrl url)
-	{
-		return ByteArrayDownloadPtr(new ByteArrayDownload(url));
-	}
-    virtual ~ByteArrayDownload() {};
-public:
-	/// if not saving to file, downloaded data is placed here
-	QByteArray m_data;
-
-	QString m_errorString;
-
-public
-slots:
-	virtual void start();
-
-protected
-slots:
-	void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	void downloadError(QNetworkReply::NetworkError error);
-	void downloadFinished();
-	void downloadReadyRead();
-};
diff --git a/libraries/logic/net/CacheDownload.cpp b/libraries/logic/net/CacheDownload.cpp
deleted file mode 100644
index 1ac55180..00000000
--- a/libraries/logic/net/CacheDownload.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "CacheDownload.h"
-
-#include <QCryptographicHash>
-#include <QFileInfo>
-#include <QDateTime>
-#include <QDebug>
-#include "Env.h"
-#include <FileSystem.h>
-
-CacheDownload::CacheDownload(QUrl url, MetaEntryPtr entry)
-	: NetAction(), md5sum(QCryptographicHash::Md5)
-{
-	m_url = url;
-	m_entry = entry;
-	m_target_path = entry->getFullPath();
-	m_status = Job_NotStarted;
-}
-
-void CacheDownload::start()
-{
-	m_status = Job_InProgress;
-	if (!m_entry->isStale())
-	{
-		m_status = Job_Finished;
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	// create a new save file
-	m_output_file.reset(new QSaveFile(m_target_path));
-
-	// if there already is a file and md5 checking is in effect and it can be opened
-	if (!FS::ensureFilePathExists(m_target_path))
-	{
-		qCritical() << "Could not create folder for " + m_target_path;
-		m_status = Job_Failed;
-		emit failed(m_index_within_job);
-		return;
-	}
-	if (!m_output_file->open(QIODevice::WriteOnly))
-	{
-		qCritical() << "Could not open " + m_target_path + " for writing";
-		m_status = Job_Failed;
-		emit failed(m_index_within_job);
-		return;
-	}
-	qDebug() << "Downloading " << m_url.toString();
-	QNetworkRequest request(m_url);
-
-	// check file consistency first.
-	QFile current(m_target_path);
-	if(current.exists() && current.size() != 0)
-	{
-		if (m_entry->getRemoteChangedTimestamp().size())
-			request.setRawHeader(QString("If-Modified-Since").toLatin1(),
-								m_entry->getRemoteChangedTimestamp().toLatin1());
-		if (m_entry->getETag().size())
-			request.setRawHeader(QString("If-None-Match").toLatin1(), m_entry->getETag().toLatin1());
-	}
-
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Cached)");
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->get(request);
-
-	m_reply.reset(rep);
-	connect(rep, SIGNAL(downloadProgress(qint64, qint64)),
-			SLOT(downloadProgress(qint64, qint64)));
-	connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
-}
-
-void CacheDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
-
-void CacheDownload::downloadError(QNetworkReply::NetworkError error)
-{
-	// error happened during download.
-	qCritical() << "Failed " << m_url.toString() << " with reason " << error;
-	m_status = Job_Failed;
-}
-void CacheDownload::downloadFinished()
-{
-	QVariant redirect = m_reply->header(QNetworkRequest::LocationHeader);
-	QString redirectURL;
-	if(redirect.isValid())
-	{
-		redirectURL = redirect.toString();
-	}
-	// FIXME: This is a hack for https://bugreports.qt-project.org/browse/QTBUG-41061
-	else if(m_reply->hasRawHeader("Location"))
-	{
-		auto data = m_reply->rawHeader("Location");
-		if(data.size() > 2 && data[0] == '/' && data[1] == '/')
-			redirectURL = m_reply->url().scheme() + ":" + data;
-	}
-	if (!redirectURL.isEmpty())
-	{
-		m_url = QUrl(redirect.toString());
-		qDebug() << "Following redirect to " << m_url.toString();
-		start();
-		return;
-	}
-
-	// if the download succeeded
-	if (m_status == Job_Failed)
-	{
-		m_output_file->cancelWriting();
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-
-	// if we wrote any data to the save file, we try to commit the data to the real file.
-	if (wroteAnyData)
-	{
-		// nothing went wrong...
-		if (m_output_file->commit())
-		{
-			m_status = Job_Finished;
-			m_entry->setMD5Sum(md5sum.result().toHex().constData());
-		}
-		else
-		{
-			qCritical() << "Failed to commit changes to " << m_target_path;
-			m_output_file->cancelWriting();
-			m_reply.reset();
-			m_status = Job_Failed;
-			emit failed(m_index_within_job);
-			return;
-		}
-	}
-	else
-	{
-		m_status = Job_Finished;
-	}
-
-	// then get rid of the save file
-	m_output_file.reset();
-
-	QFileInfo output_file_info(m_target_path);
-
-	m_entry->setETag(m_reply->rawHeader("ETag").constData());
-	if (m_reply->hasRawHeader("Last-Modified"))
-	{
-		m_entry->setRemoteChangedTimestamp(m_reply->rawHeader("Last-Modified").constData());
-	}
-	m_entry->setLocalChangedTimestamp(output_file_info.lastModified().toUTC().toMSecsSinceEpoch());
-	m_entry->setStale(false);
-	ENV.metacache()->updateEntry(m_entry);
-
-	m_reply.reset();
-	emit succeeded(m_index_within_job);
-	return;
-}
-
-void CacheDownload::downloadReadyRead()
-{
-	QByteArray ba = m_reply->readAll();
-	md5sum.addData(ba);
-	if (m_output_file->write(ba) != ba.size())
-	{
-		qCritical() << "Failed writing into " + m_target_path;
-		m_status = Job_Failed;
-		m_output_file->cancelWriting();
-		m_output_file.reset();
-		emit failed(m_index_within_job);
-		wroteAnyData = false;
-		return;
-	}
-	wroteAnyData = true;
-}
diff --git a/libraries/logic/net/CacheDownload.h b/libraries/logic/net/CacheDownload.h
deleted file mode 100644
index d83b2a0f..00000000
--- a/libraries/logic/net/CacheDownload.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "NetAction.h"
-#include "HttpMetaCache.h"
-#include <QCryptographicHash>
-#include <QSaveFile>
-
-#include "multimc_logic_export.h"
-
-typedef std::shared_ptr<class CacheDownload> CacheDownloadPtr;
-class MULTIMC_LOGIC_EXPORT CacheDownload : public NetAction
-{
-	Q_OBJECT
-private:
-	MetaEntryPtr m_entry;
-	/// if saving to file, use the one specified in this string
-	QString m_target_path;
-
-	/// this is the output file, if any
-	std::unique_ptr<QSaveFile> m_output_file;
-
-	/// the hash-as-you-download
-	QCryptographicHash md5sum;
-
-	bool wroteAnyData = false;
-
-public:
-	explicit CacheDownload(QUrl url, MetaEntryPtr entry);
-	static CacheDownloadPtr make(QUrl url, MetaEntryPtr entry)
-	{
-		return CacheDownloadPtr(new CacheDownload(url, entry));
-	}
-	virtual ~CacheDownload(){};
-	QString getTargetFilepath()
-	{
-		return m_target_path;
-	}
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	virtual void downloadError(QNetworkReply::NetworkError error);
-	virtual void downloadFinished();
-	virtual void downloadReadyRead();
-
-public
-slots:
-	virtual void start();
-};
diff --git a/libraries/logic/net/HttpMetaCache.cpp b/libraries/logic/net/HttpMetaCache.cpp
deleted file mode 100644
index ea3e2834..00000000
--- a/libraries/logic/net/HttpMetaCache.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Env.h"
-#include "HttpMetaCache.h"
-#include "FileSystem.h"
-
-#include <QFileInfo>
-#include <QFile>
-#include <QDateTime>
-#include <QCryptographicHash>
-
-#include <QDebug>
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-
-QString MetaEntry::getFullPath()
-{
-	// FIXME: make local?
-	return FS::PathCombine(basePath, relativePath);
-}
-
-HttpMetaCache::HttpMetaCache(QString path) : QObject()
-{
-	m_index_file = path;
-	saveBatchingTimer.setSingleShot(true);
-	saveBatchingTimer.setTimerType(Qt::VeryCoarseTimer);
-	connect(&saveBatchingTimer, SIGNAL(timeout()), SLOT(SaveNow()));
-}
-
-HttpMetaCache::~HttpMetaCache()
-{
-	saveBatchingTimer.stop();
-	SaveNow();
-}
-
-MetaEntryPtr HttpMetaCache::getEntry(QString base, QString resource_path)
-{
-	// no base. no base path. can't store
-	if (!m_entries.contains(base))
-	{
-		// TODO: log problem
-		return MetaEntryPtr();
-	}
-	EntryMap &map = m_entries[base];
-	if (map.entry_list.contains(resource_path))
-	{
-		return map.entry_list[resource_path];
-	}
-	return MetaEntryPtr();
-}
-
-MetaEntryPtr HttpMetaCache::resolveEntry(QString base, QString resource_path, QString expected_etag)
-{
-	auto entry = getEntry(base, resource_path);
-	// it's not present? generate a default stale entry
-	if (!entry)
-	{
-		return staleEntry(base, resource_path);
-	}
-
-	auto &selected_base = m_entries[base];
-	QString real_path = FS::PathCombine(selected_base.base_path, resource_path);
-	QFileInfo finfo(real_path);
-
-	// is the file really there? if not -> stale
-	if (!finfo.isFile() || !finfo.isReadable())
-	{
-		// if the file doesn't exist, we disown the entry
-		selected_base.entry_list.remove(resource_path);
-		return staleEntry(base, resource_path);
-	}
-
-	if (!expected_etag.isEmpty() && expected_etag != entry->etag)
-	{
-		// if the etag doesn't match expected, we disown the entry
-		selected_base.entry_list.remove(resource_path);
-		return staleEntry(base, resource_path);
-	}
-
-	// if the file changed, check md5sum
-	qint64 file_last_changed = finfo.lastModified().toUTC().toMSecsSinceEpoch();
-	if (file_last_changed != entry->local_changed_timestamp)
-	{
-		QFile input(real_path);
-		input.open(QIODevice::ReadOnly);
-		QString md5sum = QCryptographicHash::hash(input.readAll(), QCryptographicHash::Md5)
-							 .toHex()
-							 .constData();
-		if (entry->md5sum != md5sum)
-		{
-			selected_base.entry_list.remove(resource_path);
-			return staleEntry(base, resource_path);
-		}
-		// md5sums matched... keep entry and save the new state to file
-		entry->local_changed_timestamp = file_last_changed;
-		SaveEventually();
-	}
-
-	// entry passed all the checks we cared about.
-	entry->basePath = getBasePath(base);
-	return entry;
-}
-
-bool HttpMetaCache::updateEntry(MetaEntryPtr stale_entry)
-{
-	if (!m_entries.contains(stale_entry->baseId))
-	{
-		qCritical() << "Cannot add entry with unknown base: "
-					 << stale_entry->baseId.toLocal8Bit();
-		return false;
-	}
-	if (stale_entry->stale)
-	{
-		qCritical() << "Cannot add stale entry: " << stale_entry->getFullPath().toLocal8Bit();
-		return false;
-	}
-	m_entries[stale_entry->baseId].entry_list[stale_entry->relativePath] = stale_entry;
-	SaveEventually();
-	return true;
-}
-
-bool HttpMetaCache::evictEntry(MetaEntryPtr entry)
-{
-	if(entry)
-	{
-		entry->stale = true;
-		SaveEventually();
-		return true;
-	}
-	return false;
-}
-
-MetaEntryPtr HttpMetaCache::staleEntry(QString base, QString resource_path)
-{
-	auto foo = new MetaEntry();
-	foo->baseId = base;
-	foo->basePath = getBasePath(base);
-	foo->relativePath = resource_path;
-	foo->stale = true;
-	return MetaEntryPtr(foo);
-}
-
-void HttpMetaCache::addBase(QString base, QString base_root)
-{
-	// TODO: report error
-	if (m_entries.contains(base))
-		return;
-	// TODO: check if the base path is valid
-	EntryMap foo;
-	foo.base_path = base_root;
-	m_entries[base] = foo;
-}
-
-QString HttpMetaCache::getBasePath(QString base)
-{
-	if (m_entries.contains(base))
-	{
-		return m_entries[base].base_path;
-	}
-	return QString();
-}
-
-void HttpMetaCache::Load()
-{
-	if(m_index_file.isNull())
-		return;
-
-	QFile index(m_index_file);
-	if (!index.open(QIODevice::ReadOnly))
-		return;
-
-	QJsonDocument json = QJsonDocument::fromJson(index.readAll());
-	if (!json.isObject())
-		return;
-	auto root = json.object();
-	// check file version first
-	auto version_val = root.value("version");
-	if (!version_val.isString())
-		return;
-	if (version_val.toString() != "1")
-		return;
-
-	// read the entry array
-	auto entries_val = root.value("entries");
-	if (!entries_val.isArray())
-		return;
-	QJsonArray array = entries_val.toArray();
-	for (auto element : array)
-	{
-		if (!element.isObject())
-			return;
-		auto element_obj = element.toObject();
-		QString base = element_obj.value("base").toString();
-		if (!m_entries.contains(base))
-			continue;
-		auto &entrymap = m_entries[base];
-		auto foo = new MetaEntry();
-		foo->baseId = base;
-		QString path = foo->relativePath = element_obj.value("path").toString();
-		foo->md5sum = element_obj.value("md5sum").toString();
-		foo->etag = element_obj.value("etag").toString();
-		foo->local_changed_timestamp = element_obj.value("last_changed_timestamp").toDouble();
-		foo->remote_changed_timestamp =
-			element_obj.value("remote_changed_timestamp").toString();
-		// presumed innocent until closer examination
-		foo->stale = false;
-		entrymap.entry_list[path] = MetaEntryPtr(foo);
-	}
-}
-
-void HttpMetaCache::SaveEventually()
-{
-	// reset the save timer
-	saveBatchingTimer.stop();
-	saveBatchingTimer.start(30000);
-}
-
-void HttpMetaCache::SaveNow()
-{
-	if(m_index_file.isNull())
-		return;
-	QJsonObject toplevel;
-	toplevel.insert("version", QJsonValue(QString("1")));
-	QJsonArray entriesArr;
-	for (auto group : m_entries)
-	{
-		for (auto entry : group.entry_list)
-		{
-			// do not save stale entries. they are dead.
-			if(entry->stale)
-			{
-				continue;
-			}
-			QJsonObject entryObj;
-			entryObj.insert("base", QJsonValue(entry->baseId));
-			entryObj.insert("path", QJsonValue(entry->relativePath));
-			entryObj.insert("md5sum", QJsonValue(entry->md5sum));
-			entryObj.insert("etag", QJsonValue(entry->etag));
-			entryObj.insert("last_changed_timestamp",
-							QJsonValue(double(entry->local_changed_timestamp)));
-			if (!entry->remote_changed_timestamp.isEmpty())
-				entryObj.insert("remote_changed_timestamp",
-								QJsonValue(entry->remote_changed_timestamp));
-			entriesArr.append(entryObj);
-		}
-	}
-	toplevel.insert("entries", entriesArr);
-
-	QJsonDocument doc(toplevel);
-	try
-	{
-		FS::write(m_index_file, doc.toJson());
-	}
-	catch (Exception & e)
-	{
-		qWarning() << e.what();
-	}
-}
diff --git a/libraries/logic/net/HttpMetaCache.h b/libraries/logic/net/HttpMetaCache.h
deleted file mode 100644
index 7b626c70..00000000
--- a/libraries/logic/net/HttpMetaCache.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QString>
-#include <QMap>
-#include <qtimer.h>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class HttpMetaCache;
-
-class MULTIMC_LOGIC_EXPORT MetaEntry
-{
-friend class HttpMetaCache;
-protected:
-	MetaEntry() {}
-public:
-	bool isStale()
-	{
-		return stale;
-	}
-	void setStale(bool stale)
-	{
-		this->stale = stale;
-	}
-	QString getFullPath();
-	QString getRemoteChangedTimestamp()
-	{
-		return remote_changed_timestamp;
-	}
-	void setRemoteChangedTimestamp(QString remote_changed_timestamp)
-	{
-		this->remote_changed_timestamp = remote_changed_timestamp;
-	}
-	void setLocalChangedTimestamp(qint64 timestamp)
-	{
-		local_changed_timestamp = timestamp;
-	}
-	QString getETag()
-	{
-		return etag;
-	}
-	void setETag(QString etag)
-	{
-		this->etag = etag;
-	}
-	QString getMD5Sum()
-	{
-		return md5sum;
-	}
-	void setMD5Sum(QString md5sum)
-	{
-		this->md5sum = md5sum;
-	}
-protected:
-	QString baseId;
-	QString basePath;
-	QString relativePath;
-	QString md5sum;
-	QString etag;
-	qint64 local_changed_timestamp = 0;
-	QString remote_changed_timestamp; // QString for now, RFC 2822 encoded time
-	bool stale = true;
-};
-
-typedef std::shared_ptr<MetaEntry> MetaEntryPtr;
-
-class MULTIMC_LOGIC_EXPORT HttpMetaCache : public QObject
-{
-	Q_OBJECT
-public:
-	// supply path to the cache index file
-	HttpMetaCache(QString path = QString());
-	~HttpMetaCache();
-
-	// get the entry solely from the cache
-	// you probably don't want this, unless you have some specific caching needs.
-	MetaEntryPtr getEntry(QString base, QString resource_path);
-
-	// get the entry from cache and verify that it isn't stale (within reason)
-	MetaEntryPtr resolveEntry(QString base, QString resource_path,
-							  QString expected_etag = QString());
-
-	// add a previously resolved stale entry
-	bool updateEntry(MetaEntryPtr stale_entry);
-
-	// evict selected entry from cache
-	bool evictEntry(MetaEntryPtr entry);
-
-	void addBase(QString base, QString base_root);
-
-	// (re)start a timer that calls SaveNow later.
-	void SaveEventually();
-	void Load();
-	QString getBasePath(QString base);
-public
-slots:
-	void SaveNow();
-
-private:
-	// create a new stale entry, given the parameters
-	MetaEntryPtr staleEntry(QString base, QString resource_path);
-	struct EntryMap
-	{
-		QString base_path;
-		QMap<QString, MetaEntryPtr> entry_list;
-	};
-	QMap<QString, EntryMap> m_entries;
-	QString m_index_file;
-	QTimer saveBatchingTimer;
-};
diff --git a/libraries/logic/net/MD5EtagDownload.cpp b/libraries/logic/net/MD5EtagDownload.cpp
deleted file mode 100644
index 3b4d5dcd..00000000
--- a/libraries/logic/net/MD5EtagDownload.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Env.h"
-#include "MD5EtagDownload.h"
-#include <FileSystem.h>
-#include <QCryptographicHash>
-#include <QDebug>
-
-MD5EtagDownload::MD5EtagDownload(QUrl url, QString target_path) : NetAction()
-{
-	m_url = url;
-	m_target_path = target_path;
-	m_status = Job_NotStarted;
-}
-
-void MD5EtagDownload::start()
-{
-	QString filename = m_target_path;
-	m_output_file.setFileName(filename);
-	// if there already is a file and md5 checking is in effect and it can be opened
-	if (m_output_file.exists() && m_output_file.open(QIODevice::ReadOnly))
-	{
-		// get the md5 of the local file.
-		m_local_md5 =
-			QCryptographicHash::hash(m_output_file.readAll(), QCryptographicHash::Md5)
-				.toHex()
-				.constData();
-		m_output_file.close();
-		// if we are expecting some md5sum, compare it with the local one
-		if (!m_expected_md5.isEmpty())
-		{
-			// skip if they match
-			if(m_local_md5 == m_expected_md5)
-			{
-				qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
-				emit succeeded(m_index_within_job);
-				return;
-			}
-		}
-		else
-		{
-			// no expected md5. we use the local md5sum as an ETag
-		}
-	}
-	if (!FS::ensureFilePathExists(filename))
-	{
-		emit failed(m_index_within_job);
-		return;
-	}
-
-	QNetworkRequest request(m_url);
-
-	qDebug() << "Downloading " << m_url.toString() << " local MD5: " << m_local_md5;
-
-	if(!m_local_md5.isEmpty())
-	{
-		request.setRawHeader(QString("If-None-Match").toLatin1(), m_local_md5.toLatin1());
-	}
-	if(!m_expected_md5.isEmpty())
-		qDebug() << "Expecting " << m_expected_md5;
-
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-
-	// Go ahead and try to open the file.
-	// If we don't do this, empty files won't be created, which breaks the updater.
-	// Plus, this way, we don't end up starting a download for a file we can't open.
-	if (!m_output_file.open(QIODevice::WriteOnly))
-	{
-		emit failed(m_index_within_job);
-		return;
-	}
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->get(request);
-
-	m_reply.reset(rep);
-	connect(rep, SIGNAL(downloadProgress(qint64, qint64)),
-			SLOT(downloadProgress(qint64, qint64)));
-	connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
-}
-
-void MD5EtagDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
-
-void MD5EtagDownload::downloadError(QNetworkReply::NetworkError error)
-{
-	qCritical() << "Error" << error << ":" << m_reply->errorString() << "while downloading"
-				 << m_reply->url();
-	m_status = Job_Failed;
-}
-
-void MD5EtagDownload::downloadFinished()
-{
-	// if the download succeeded
-	if (m_status != Job_Failed)
-	{
-		// nothing went wrong...
-		m_status = Job_Finished;
-		m_output_file.close();
-
-		// FIXME: compare with the real written data md5sum
-		// this is just an ETag
-		qDebug() << "Finished " << m_url.toString() << " got " << m_reply->rawHeader("ETag").constData();
-
-		m_reply.reset();
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	// else the download failed
-	else
-	{
-		m_output_file.close();
-		m_output_file.remove();
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-}
-
-void MD5EtagDownload::downloadReadyRead()
-{
-	if (!m_output_file.isOpen())
-	{
-		if (!m_output_file.open(QIODevice::WriteOnly))
-		{
-			/*
-			* Can't open the file... the job failed
-			*/
-			m_reply->abort();
-			emit failed(m_index_within_job);
-			return;
-		}
-	}
-	m_output_file.write(m_reply->readAll());
-}
diff --git a/libraries/logic/net/MD5EtagDownload.h b/libraries/logic/net/MD5EtagDownload.h
deleted file mode 100644
index cd1cb550..00000000
--- a/libraries/logic/net/MD5EtagDownload.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "NetAction.h"
-#include <QFile>
-
-typedef std::shared_ptr<class MD5EtagDownload> Md5EtagDownloadPtr;
-class MD5EtagDownload : public NetAction
-{
-	Q_OBJECT
-public:
-	/// the expected md5 checksum. Only set from outside
-	QString m_expected_md5;
-	/// the md5 checksum of a file that already exists.
-	QString m_local_md5;
-	/// if saving to file, use the one specified in this string
-	QString m_target_path;
-	/// this is the output file, if any
-	QFile m_output_file;
-
-public:
-	explicit MD5EtagDownload(QUrl url, QString target_path);
-	static Md5EtagDownloadPtr make(QUrl url, QString target_path)
-	{
-		return Md5EtagDownloadPtr(new MD5EtagDownload(url, target_path));
-	}
-	virtual ~MD5EtagDownload(){};
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	virtual void downloadError(QNetworkReply::NetworkError error);
-	virtual void downloadFinished();
-	virtual void downloadReadyRead();
-
-public
-slots:
-	virtual void start();
-};
diff --git a/libraries/logic/net/NetAction.h b/libraries/logic/net/NetAction.h
deleted file mode 100644
index 3c395605..00000000
--- a/libraries/logic/net/NetAction.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QUrl>
-#include <memory>
-#include <QNetworkReply>
-#include <QObjectPtr.h>
-
-#include "multimc_logic_export.h"
-
-enum JobStatus
-{
-	Job_NotStarted,
-	Job_InProgress,
-	Job_Finished,
-	Job_Failed
-};
-
-typedef std::shared_ptr<class NetAction> NetActionPtr;
-class MULTIMC_LOGIC_EXPORT NetAction : public QObject
-{
-	Q_OBJECT
-protected:
-	explicit NetAction() : QObject(0) {};
-
-public:
-	virtual ~NetAction() {};
-
-public:
-	virtual qint64 totalProgress() const
-	{
-		return m_total_progress;
-	}
-	virtual qint64 currentProgress() const
-	{
-		return m_progress;
-	}
-	virtual qint64 numberOfFailures() const
-	{
-		return m_failures;
-	}
-
-public:
-	/// the network reply
-	unique_qobject_ptr<QNetworkReply> m_reply;
-
-	/// the content of the content-type header
-	QString m_content_type;
-
-	/// source URL
-	QUrl m_url;
-
-	/// The file's status
-	JobStatus m_status = Job_NotStarted;
-
-	/// index within the parent job
-	int m_index_within_job = 0;
-
-	qint64 m_progress = 0;
-	qint64 m_total_progress = 1;
-
-	/// number of failures up to this point
-	int m_failures = 0;
-
-signals:
-	void started(int index);
-	void netActionProgress(int index, qint64 current, qint64 total);
-	void succeeded(int index);
-	void failed(int index);
-
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) = 0;
-	virtual void downloadError(QNetworkReply::NetworkError error) = 0;
-	virtual void downloadFinished() = 0;
-	virtual void downloadReadyRead() = 0;
-
-public
-slots:
-	virtual void start() = 0;
-};
diff --git a/libraries/logic/net/NetJob.cpp b/libraries/logic/net/NetJob.cpp
deleted file mode 100644
index 76c61c35..00000000
--- a/libraries/logic/net/NetJob.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NetJob.h"
-#include "MD5EtagDownload.h"
-#include "ByteArrayDownload.h"
-#include "CacheDownload.h"
-
-#include <QDebug>
-
-void NetJob::partSucceeded(int index)
-{
-	// do progress. all slots are 1 in size at least
-	auto &slot = parts_progress[index];
-	partProgress(index, slot.total_progress, slot.total_progress);
-
-	m_doing.remove(index);
-	m_done.insert(index);
-	downloads[index].get()->disconnect(this);
-	startMoreParts();
-}
-
-void NetJob::partFailed(int index)
-{
-	m_doing.remove(index);
-	auto &slot = parts_progress[index];
-	if (slot.failures == 3)
-	{
-		m_failed.insert(index);
-	}
-	else
-	{
-		slot.failures++;
-		m_todo.enqueue(index);
-	}
-	downloads[index].get()->disconnect(this);
-	startMoreParts();
-}
-
-void NetJob::partProgress(int index, qint64 bytesReceived, qint64 bytesTotal)
-{
-	auto &slot = parts_progress[index];
-
-	current_progress -= slot.current_progress;
-	slot.current_progress = bytesReceived;
-	current_progress += slot.current_progress;
-
-	total_progress -= slot.total_progress;
-	slot.total_progress = bytesTotal;
-	total_progress += slot.total_progress;
-	setProgress(current_progress, total_progress);
-}
-
-void NetJob::executeTask()
-{
-	qDebug() << m_job_name.toLocal8Bit() << " started.";
-	m_running = true;
-	for (int i = 0; i < downloads.size(); i++)
-	{
-		m_todo.enqueue(i);
-	}
-	// hack that delays early failures so they can be caught easier
-	QMetaObject::invokeMethod(this, "startMoreParts", Qt::QueuedConnection);
-}
-
-void NetJob::startMoreParts()
-{
-	// check for final conditions if there's nothing in the queue
-	if(!m_todo.size())
-	{
-		if(!m_doing.size())
-		{
-			if(!m_failed.size())
-			{
-				qDebug() << m_job_name << "succeeded.";
-				emitSucceeded();
-			}
-			else
-			{
-				qCritical() << m_job_name << "failed.";
-				emitFailed(tr("Job '%1' failed to process:\n%2").arg(m_job_name).arg(getFailedFiles().join("\n")));
-			}
-		}
-		return;
-	}
-	// otherwise try to start more parts
-	while (m_doing.size() < 6)
-	{
-		if(!m_todo.size())
-			return;
-		int doThis = m_todo.dequeue();
-		m_doing.insert(doThis);
-		auto part = downloads[doThis];
-		// connect signals :D
-		connect(part.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int)));
-		connect(part.get(), SIGNAL(failed(int)), SLOT(partFailed(int)));
-		connect(part.get(), SIGNAL(netActionProgress(int, qint64, qint64)),
-				SLOT(partProgress(int, qint64, qint64)));
-		part->start();
-	}
-}
-
-
-QStringList NetJob::getFailedFiles()
-{
-	QStringList failed;
-	for (auto index: m_failed)
-	{
-		failed.push_back(downloads[index]->m_url.toString());
-	}
-	failed.sort();
-	return failed;
-}
diff --git a/libraries/logic/net/NetJob.h b/libraries/logic/net/NetJob.h
deleted file mode 100644
index 167fe176..00000000
--- a/libraries/logic/net/NetJob.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include <QtNetwork>
-#include "NetAction.h"
-#include "ByteArrayDownload.h"
-#include "MD5EtagDownload.h"
-#include "CacheDownload.h"
-#include "HttpMetaCache.h"
-#include "tasks/Task.h"
-#include "QObjectPtr.h"
-
-#include "multimc_logic_export.h"
-
-class NetJob;
-typedef shared_qobject_ptr<NetJob> NetJobPtr;
-
-class MULTIMC_LOGIC_EXPORT NetJob : public Task
-{
-	Q_OBJECT
-public:
-	explicit NetJob(QString job_name) : Task(), m_job_name(job_name) {}
-	virtual ~NetJob() {}
-	bool addNetAction(NetActionPtr action)
-	{
-		action->m_index_within_job = downloads.size();
-		downloads.append(action);
-		part_info pi;
-		{
-			pi.current_progress = action->currentProgress();
-			pi.total_progress = action->totalProgress();
-			pi.failures = action->numberOfFailures();
-		}
-		parts_progress.append(pi);
-		total_progress += pi.total_progress;
-		// if this is already running, the action needs to be started right away!
-		if (isRunning())
-		{
-			setProgress(current_progress, total_progress);
-			connect(action.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int)));
-			connect(action.get(), SIGNAL(failed(int)), SLOT(partFailed(int)));
-			connect(action.get(), SIGNAL(netActionProgress(int, qint64, qint64)),
-					SLOT(partProgress(int, qint64, qint64)));
-			action->start();
-		}
-		return true;
-	}
-
-	NetActionPtr operator[](int index)
-	{
-		return downloads[index];
-	}
-	const NetActionPtr at(const int index)
-	{
-		return downloads.at(index);
-	}
-	NetActionPtr first()
-	{
-		if (downloads.size())
-			return downloads[0];
-		return NetActionPtr();
-	}
-	int size() const
-	{
-		return downloads.size();
-	}
-	virtual bool isRunning() const
-	{
-		return m_running;
-	}
-	QStringList getFailedFiles();
-
-private slots:
-	void startMoreParts();
-
-public slots:
-	virtual void executeTask();
-	// FIXME: implement
-	virtual bool abort() {return false;};
-
-private slots:
-	void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);
-	void partSucceeded(int index);
-	void partFailed(int index);
-
-private:
-	struct part_info
-	{
-		qint64 current_progress = 0;
-		qint64 total_progress = 1;
-		int failures = 0;
-		bool connected = false;
-	};
-	QString m_job_name;
-	QList<NetActionPtr> downloads;
-	QList<part_info> parts_progress;
-	QQueue<int> m_todo;
-	QSet<int> m_doing;
-	QSet<int> m_done;
-	QSet<int> m_failed;
-	qint64 current_progress = 0;
-	qint64 total_progress = 0;
-	bool m_running = false;
-};
diff --git a/libraries/logic/net/PasteUpload.cpp b/libraries/logic/net/PasteUpload.cpp
deleted file mode 100644
index 4b671d6f..00000000
--- a/libraries/logic/net/PasteUpload.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "PasteUpload.h"
-#include "Env.h"
-#include <QDebug>
-#include <QJsonObject>
-#include <QJsonDocument>
-
-PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window)
-{
-	m_key = key;
-	QByteArray temp;
-	temp = text.toUtf8();
-	temp.replace('\n', "\r\n");
-	m_textSize = temp.size();
-	m_text = "key=" + m_key.toLatin1() + "&description=MultiMC5+Log+File&language=plain&format=json&expire=2592000&paste=" + temp.toPercentEncoding();
-	buf =  new QBuffer(&m_text);
-}
-
-PasteUpload::~PasteUpload()
-{
-	if(buf)
-	{
-		delete buf;
-	}
-}
-
-bool PasteUpload::validateText()
-{
-	return m_textSize <= maxSize();
-}
-
-void PasteUpload::executeTask()
-{
-	QNetworkRequest request(QUrl("http://paste.ee/api"));
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-
-	request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
-	request.setRawHeader("Content-Length", QByteArray::number(m_text.size()));
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->post(request, buf);
-
-	m_reply = std::shared_ptr<QNetworkReply>(rep);
-	setStatus(tr("Uploading to paste.ee"));
-	connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress);
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(downloadError(QNetworkReply::NetworkError)));
-	connect(rep, SIGNAL(finished()), this, SLOT(downloadFinished()));
-}
-
-void PasteUpload::downloadError(QNetworkReply::NetworkError error)
-{
-	// error happened during download.
-	qCritical() << "Network error: " << error;
-	emitFailed(m_reply->errorString());
-}
-
-void PasteUpload::downloadFinished()
-{
-	// if the download succeeded
-	if (m_reply->error() == QNetworkReply::NetworkError::NoError)
-	{
-		QByteArray data = m_reply->readAll();
-		m_reply.reset();
-		QJsonParseError jsonError;
-		QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-		if (jsonError.error != QJsonParseError::NoError)
-		{
-			emitFailed(jsonError.errorString());
-			return;
-		}
-		if (!parseResult(doc))
-		{
-			emitFailed(tr("paste.ee returned an error. Please consult the logs for more information"));
-			return;
-		}
-	}
-	// else the download failed
-	else
-	{
-		emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
-		m_reply.reset();
-		return;
-	}
-	emitSucceeded();
-}
-
-bool PasteUpload::parseResult(QJsonDocument doc)
-{
-	auto object = doc.object();
-	auto status = object.value("status").toString("error");
-	if (status == "error")
-	{
-		qCritical() << "paste.ee reported error:" << QString(object.value("error").toString());
-		return false;
-	}
-	m_pasteLink = object.value("paste").toObject().value("link").toString();
-	m_pasteID = object.value("paste").toObject().value("id").toString();
-	return true;
-}
-
diff --git a/libraries/logic/net/PasteUpload.h b/libraries/logic/net/PasteUpload.h
deleted file mode 100644
index 06e3f955..00000000
--- a/libraries/logic/net/PasteUpload.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-#include "tasks/Task.h"
-#include <QNetworkReply>
-#include <QBuffer>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT PasteUpload : public Task
-{
-	Q_OBJECT
-public:
-	PasteUpload(QWidget *window, QString text, QString key = "public");
-	virtual ~PasteUpload();
-	QString pasteLink()
-	{
-		return m_pasteLink;
-	}
-	QString pasteID()
-	{
-		return m_pasteID;
-	}
-	uint32_t maxSize()
-	{
-		// 2MB for paste.ee - public
-		if(m_key == "public")
-			return 1024*1024*2;
-		// 12MB for paste.ee - with actual key
-		return 1024*1024*12;
-	}
-	bool validateText();
-protected:
-	virtual void executeTask();
-
-private:
-	bool parseResult(QJsonDocument doc);
-	QByteArray m_text;
-	QString m_error;
-	QWidget *m_window;
-	QString m_pasteID;
-	QString m_pasteLink;
-	QString m_key;
-	int m_textSize = 0;
-	QBuffer * buf = nullptr;
-	std::shared_ptr<QNetworkReply> m_reply;
-public
-slots:
-	void downloadError(QNetworkReply::NetworkError);
-	void downloadFinished();
-};
diff --git a/libraries/logic/net/URLConstants.cpp b/libraries/logic/net/URLConstants.cpp
deleted file mode 100644
index bd476b2c..00000000
--- a/libraries/logic/net/URLConstants.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "URLConstants.h"
-
-namespace URLConstants {
-
-QString getLegacyJarUrl(QString version)
-{
-	return "http://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version);
-}
-
-QString getJarPath(QString version)
-{
-	return version + "/" + version + ".jar";
-}
-
-
-}
diff --git a/libraries/logic/net/URLConstants.h b/libraries/logic/net/URLConstants.h
deleted file mode 100644
index 8923ef54..00000000
--- a/libraries/logic/net/URLConstants.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-
-namespace URLConstants
-{
-const QString AWS_DOWNLOAD_VERSIONS("s3.amazonaws.com/Minecraft.Download/versions/");
-const QString RESOURCE_BASE("resources.download.minecraft.net/");
-const QString LIBRARY_BASE("libraries.minecraft.net/");
-//const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/");
-const QString SKINS_BASE("crafatar.com/skins/");
-const QString AUTH_BASE("authserver.mojang.com/");
-const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/json");
-const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json");
-const QString MOJANG_STATUS_URL("http://status.mojang.com/check");
-const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news");
-const QString LITELOADER_URL("http://dl.liteloader.com/versions/versions.json");
-const QString IMGUR_BASE_URL("https://api.imgur.com/3/");
-const QString FMLLIBS_OUR_BASE_URL("http://files.multimc.org/fmllibs/");
-const QString FMLLIBS_FORGE_BASE_URL("http://files.minecraftforge.net/fmllibs/");
-const QString TRANSLATIONS_BASE_URL("http://files.multimc.org/translations/");
-
-QString getJarPath(QString version);
-QString getLegacyJarUrl(QString version);
-}
diff --git a/libraries/logic/news/NewsChecker.cpp b/libraries/logic/news/NewsChecker.cpp
deleted file mode 100644
index be4aa1d1..00000000
--- a/libraries/logic/news/NewsChecker.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsChecker.h"
-
-#include <QByteArray>
-#include <QDomDocument>
-
-#include <QDebug>
-
-NewsChecker::NewsChecker(const QString& feedUrl)
-{
-	m_feedUrl = feedUrl;
-}
-
-void NewsChecker::reloadNews()
-{
-	// Start a netjob to download the RSS feed and call rssDownloadFinished() when it's done.
-	if (isLoadingNews())
-	{
-		qDebug() << "Ignored request to reload news. Currently reloading already.";
-		return;
-	}
-
-	qDebug() << "Reloading news.";
-
-	NetJob* job = new NetJob("News RSS Feed");
-	job->addNetAction(ByteArrayDownload::make(m_feedUrl));
-	QObject::connect(job, &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
-	QObject::connect(job, &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
-	m_newsNetJob.reset(job);
-	job->start();
-}
-
-void NewsChecker::rssDownloadFinished()
-{
-	// Parse the XML file and process the RSS feed entries.
-	qDebug() << "Finished loading RSS feed.";
-
-	QByteArray data;
-	{
-		ByteArrayDownloadPtr dl = std::dynamic_pointer_cast<ByteArrayDownload>(m_newsNetJob->first());
-		data = dl->m_data;
-		m_newsNetJob.reset();
-	}
-
-	QDomDocument doc;
-	{
-		// Stuff to store error info in.
-		QString errorMsg = "Unknown error.";
-		int errorLine = -1;
-		int errorCol = -1;
-
-		// Parse the XML.
-		if (!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol))
-		{
-			QString fullErrorMsg = QString("Error parsing RSS feed XML. %s at %d:%d.").arg(errorMsg, errorLine, errorCol);
-			fail(fullErrorMsg);
-			return;
-		}
-	}
-
-	// If the parsing succeeded, read it.
-	QDomNodeList items = doc.elementsByTagName("item");
-	m_newsEntries.clear();
-	for (int i = 0; i < items.length(); i++)
-	{
-		QDomElement element = items.at(i).toElement();
-		NewsEntryPtr entry;
-		entry.reset(new NewsEntry());
-		QString errorMsg = "An unknown error occurred.";
-		if (NewsEntry::fromXmlElement(element, entry.get(), &errorMsg))
-		{
-			qDebug() << "Loaded news entry" << entry->title;
-			m_newsEntries.append(entry);
-		}
-		else
-		{
-			qWarning() << "Failed to load news entry at index" << i << ":" << errorMsg;
-		}
-	}
-
-	succeed();
-}
-
-void NewsChecker::rssDownloadFailed(QString reason)
-{
-	// Set an error message and fail.
-	fail(tr("Failed to load news RSS feed:\n%1").arg(reason));
-}
-
-
-QList<NewsEntryPtr> NewsChecker::getNewsEntries() const
-{
-	return m_newsEntries;
-}
-
-bool NewsChecker::isLoadingNews() const
-{
-	return m_newsNetJob.get() != nullptr;
-}
-
-QString NewsChecker::getLastLoadErrorMsg() const
-{
-	return m_lastLoadError;
-}
-
-void NewsChecker::succeed()
-{
-	m_lastLoadError = "";
-	qDebug() << "News loading succeeded.";
-	m_newsNetJob.reset();
-	emit newsLoaded();
-}
-
-void NewsChecker::fail(const QString& errorMsg)
-{
-	m_lastLoadError = errorMsg;
-	qDebug() << "Failed to load news:" << errorMsg;
-	m_newsNetJob.reset();
-	emit newsLoadingFailed(errorMsg);
-}
-
diff --git a/libraries/logic/news/NewsChecker.h b/libraries/logic/news/NewsChecker.h
deleted file mode 100644
index b8b90728..00000000
--- a/libraries/logic/news/NewsChecker.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-
-#include <net/NetJob.h>
-
-#include "NewsEntry.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT NewsChecker : public QObject
-{
-	Q_OBJECT
-public:
-	/*!
-	 * Constructs a news reader to read from the given RSS feed URL.
-	 */
-	NewsChecker(const QString& feedUrl);
-
-	/*!
-	 * Returns the error message for the last time the news was loaded.
-	 * Empty string if the last load was successful.
-	 */
-	QString getLastLoadErrorMsg() const;
-
-	/*!
-	 * Returns true if the news has been loaded successfully.
-	 */
-	bool isNewsLoaded() const;
-
-	//! True if the news is currently loading. If true, reloadNews() will do nothing.
-	bool isLoadingNews() const;
-
-	/*!
-	 * Returns a list of news entries.
-	 */
-	QList<NewsEntryPtr> getNewsEntries() const;
-
-	/*!
-	 * Reloads the news from the website's RSS feed.
-	 * If the news is already loading, this does nothing.
-	 */
-	void Q_SLOT reloadNews();
-
-signals:
-	/*!
-	 * Signal fired after the news has finished loading.
-	 */
-	void newsLoaded();
-
-	/*!
-	 * Signal fired after the news fails to load.
-	 */
-	void newsLoadingFailed(QString errorMsg);
-
-protected slots:
-	void rssDownloadFinished();
-	void rssDownloadFailed(QString reason);
-
-protected:
-	//! The URL for the RSS feed to fetch.
-	QString m_feedUrl;
-
-	//! List of news entries.
-	QList<NewsEntryPtr> m_newsEntries;
-
-	//! The network job to use to load the news.
-	NetJobPtr m_newsNetJob;
-
-	//! True if news has been loaded.
-	bool m_loadedNews;
-
-	/*!
-	 * Gets the error message that was given last time the news was loaded.
-	 * If the last news load succeeded, this will be an empty string.
-	 */
-	QString m_lastLoadError;
-
-
-	/*!
-	 * Emits newsLoaded() and sets m_lastLoadError to empty string.
-	 */
-	void Q_SLOT succeed();
-
-	/*!
-	 * Emits newsLoadingFailed() and sets m_lastLoadError to the given message.
-	 */
-	void Q_SLOT fail(const QString& errorMsg);
-};
-
diff --git a/libraries/logic/news/NewsEntry.cpp b/libraries/logic/news/NewsEntry.cpp
deleted file mode 100644
index 79abbaa3..00000000
--- a/libraries/logic/news/NewsEntry.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NewsEntry.h"
-
-#include <QDomNodeList>
-#include <QVariant>
-
-NewsEntry::NewsEntry(QObject* parent) :
-	QObject(parent)
-{
-	this->title = tr("Untitled");
-	this->content = tr("No content.");
-	this->link = "";
-	this->author = tr("Unknown Author");
-	this->pubDate = QDateTime::currentDateTime();
-}
-
-NewsEntry::NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent) :
-	QObject(parent)
-{
-	this->title = title;
-	this->content = content;
-	this->link = link;
-	this->author = author;
-	this->pubDate = pubDate;
-}
-
-/*!
- * Gets the text content of the given child element as a QVariant.
- */
-inline QString childValue(const QDomElement& element, const QString& childName, QString defaultVal="")
-{
-	QDomNodeList nodes = element.elementsByTagName(childName);
-	if (nodes.count() > 0)
-	{
-		QDomElement element = nodes.at(0).toElement();
-		return element.text();
-	}
-	else
-	{
-		return defaultVal;
-	}
-}
-
-bool NewsEntry::fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg)
-{
-	QString title = childValue(element, "title", tr("Untitled"));
-	QString content = childValue(element, "description", tr("No content."));
-	QString link = childValue(element, "link");
-	QString author = childValue(element, "dc:creator", tr("Unknown Author"));
-	QString pubDateStr = childValue(element, "pubDate");
-
-	// FIXME: For now, we're just ignoring timezones. We assume that all time zones in the RSS feed are the same.
-	QString dateFormat("ddd, dd MMM yyyy hh:mm:ss");
-	QDateTime pubDate = QDateTime::fromString(pubDateStr, dateFormat);
-
-	entry->title = title;
-	entry->content = content;
-	entry->link = link;
-	entry->author = author;
-	entry->pubDate = pubDate;
-	return true;
-}
-
diff --git a/libraries/logic/news/NewsEntry.h b/libraries/logic/news/NewsEntry.h
deleted file mode 100644
index adb79e8f..00000000
--- a/libraries/logic/news/NewsEntry.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QDomElement>
-#include <QDateTime>
-
-#include <memory>
-
-class NewsEntry : public QObject
-{
-	Q_OBJECT
-
-public:
-	/*!
-	 * Constructs an empty news entry.
-	 */
-	explicit NewsEntry(QObject* parent=0);
-
-	/*!
-	 * Constructs a new news entry.
-	 * Note that content may contain HTML.
-	 */
-	NewsEntry(const QString& title, const QString& content, const QString& link, const QString& author, const QDateTime& pubDate, QObject* parent=0);
-
-	/*!
-	 * Attempts to load information from the given XML element into the given news entry pointer.
-	 * If this fails, the function will return false and store an error message in the errorMsg pointer.
-	 */
-	static bool fromXmlElement(const QDomElement& element, NewsEntry* entry, QString* errorMsg=0);
-
-
-	//! The post title.
-	QString title;
-
-	//! The post's content. May contain HTML.
-	QString content;
-
-	//! URL to the post.
-	QString link;
-
-	//! The post's author.
-	QString author;
-	
-	//! The date and time that this post was published.
-	QDateTime pubDate;
-};
-
-typedef std::shared_ptr<NewsEntry> NewsEntryPtr;
-
diff --git a/libraries/logic/notifications/NotificationChecker.cpp b/libraries/logic/notifications/NotificationChecker.cpp
deleted file mode 100644
index ab2570b7..00000000
--- a/libraries/logic/notifications/NotificationChecker.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "NotificationChecker.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QDebug>
-
-#include "Env.h"
-#include "net/CacheDownload.h"
-
-
-NotificationChecker::NotificationChecker(QObject *parent)
-	: QObject(parent)
-{
-}
-
-void NotificationChecker::setNotificationsUrl(const QUrl &notificationsUrl)
-{
-	m_notificationsUrl = notificationsUrl;
-}
-
-void NotificationChecker::setApplicationChannel(QString channel)
-{
-	m_appVersionChannel = channel;
-}
-
-void NotificationChecker::setApplicationFullVersion(QString version)
-{
-	m_appFullVersion = version;
-}
-
-void NotificationChecker::setApplicationPlatform(QString platform)
-{
-	m_appPlatform = platform;
-}
-
-QList<NotificationChecker::NotificationEntry> NotificationChecker::notificationEntries() const
-{
-	return m_entries;
-}
-
-void NotificationChecker::checkForNotifications()
-{
-	if (!m_notificationsUrl.isValid())
-	{
-		qCritical() << "Failed to check for notifications. No notifications URL set."
-					 << "If you'd like to use MultiMC's notification system, please pass the "
-						"URL to CMake at compile time.";
-		return;
-	}
-	if (m_checkJob)
-	{
-		return;
-	}
-	m_checkJob.reset(new NetJob("Checking for notifications"));
-	auto entry = ENV.metacache()->resolveEntry("root", "notifications.json");
-	entry->setStale(true);
-	m_checkJob->addNetAction(m_download = CacheDownload::make(m_notificationsUrl, entry));
-	connect(m_download.get(), &CacheDownload::succeeded, this,
-			&NotificationChecker::downloadSucceeded);
-	m_checkJob->start();
-}
-
-void NotificationChecker::downloadSucceeded(int)
-{
-	m_entries.clear();
-
-	QFile file(m_download->getTargetFilepath());
-	if (file.open(QFile::ReadOnly))
-	{
-		QJsonArray root = QJsonDocument::fromJson(file.readAll()).array();
-		for (auto it = root.begin(); it != root.end(); ++it)
-		{
-			QJsonObject obj = (*it).toObject();
-			NotificationEntry entry;
-			entry.id = obj.value("id").toDouble();
-			entry.message = obj.value("message").toString();
-			entry.channel = obj.value("channel").toString();
-			entry.platform = obj.value("platform").toString();
-			entry.from = obj.value("from").toString();
-			entry.to = obj.value("to").toString();
-			const QString type = obj.value("type").toString("critical");
-			if (type == "critical")
-			{
-				entry.type = NotificationEntry::Critical;
-			}
-			else if (type == "warning")
-			{
-				entry.type = NotificationEntry::Warning;
-			}
-			else if (type == "information")
-			{
-				entry.type = NotificationEntry::Information;
-			}
-			if(entryApplies(entry))
-				m_entries.append(entry);
-		}
-	}
-
-	m_checkJob.reset();
-
-	emit notificationCheckFinished();
-}
-
-bool versionLessThan(const QString &v1, const QString &v2)
-{
-	QStringList l1 = v1.split('.');
-	QStringList l2 = v2.split('.');
-	while (!l1.isEmpty() && !l2.isEmpty())
-	{
-		int one = l1.isEmpty() ? 0 : l1.takeFirst().toInt();
-		int two = l2.isEmpty() ? 0 : l2.takeFirst().toInt();
-		if (one != two)
-		{
-			return one < two;
-		}
-	}
-	return false;
-}
-
-bool NotificationChecker::entryApplies(const NotificationChecker::NotificationEntry& entry) const
-{
-	bool channelApplies = entry.channel.isEmpty() || entry.channel == m_appVersionChannel;
-	bool platformApplies = entry.platform.isEmpty() || entry.platform == m_appPlatform;
-	bool fromApplies =
-		entry.from.isEmpty() || entry.from == m_appFullVersion || !versionLessThan(m_appFullVersion, entry.from);
-	bool toApplies =
-		entry.to.isEmpty() || entry.to == m_appFullVersion || !versionLessThan(entry.to, m_appFullVersion);
-	return channelApplies && platformApplies && fromApplies && toApplies;
-}
diff --git a/libraries/logic/notifications/NotificationChecker.h b/libraries/logic/notifications/NotificationChecker.h
deleted file mode 100644
index a2d92ab9..00000000
--- a/libraries/logic/notifications/NotificationChecker.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <QObject>
-
-#include "net/NetJob.h"
-#include "net/CacheDownload.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT NotificationChecker : public QObject
-{
-	Q_OBJECT
-
-public:
-	explicit NotificationChecker(QObject *parent = 0);
-
-	void setNotificationsUrl(const QUrl &notificationsUrl);
-	void setApplicationPlatform(QString platform);
-	void setApplicationChannel(QString channel);
-	void setApplicationFullVersion(QString version);
-
-	struct NotificationEntry
-	{
-		int id;
-		QString message;
-		enum
-		{
-			Critical,
-			Warning,
-			Information
-		} type;
-		QString channel;
-		QString platform;
-		QString from;
-		QString to;
-	};
-
-	QList<NotificationEntry> notificationEntries() const;
-
-public
-slots:
-	void checkForNotifications();
-
-private
-slots:
-	void downloadSucceeded(int);
-
-signals:
-	void notificationCheckFinished();
-
-private:
-	bool entryApplies(const NotificationEntry &entry) const;
-
-private:
-	QList<NotificationEntry> m_entries;
-	QUrl m_notificationsUrl;
-	NetJobPtr m_checkJob;
-	CacheDownloadPtr m_download;
-
-	QString m_appVersionChannel;
-	QString m_appPlatform;
-	QString m_appFullVersion;
-};
diff --git a/libraries/logic/pathmatcher/FSTreeMatcher.h b/libraries/logic/pathmatcher/FSTreeMatcher.h
deleted file mode 100644
index a5bed57c..00000000
--- a/libraries/logic/pathmatcher/FSTreeMatcher.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "IPathMatcher.h"
-#include <SeparatorPrefixTree.h>
-#include <QRegularExpression>
-
-class FSTreeMatcher : public IPathMatcher
-{
-public:
-	virtual ~FSTreeMatcher() {};
-	FSTreeMatcher(SeparatorPrefixTree<'/'> & tree) : m_fsTree(tree)
-	{
-	}
-
-	virtual bool matches(const QString &string) const override
-	{
-		return m_fsTree.covers(string);
-	}
-
-	SeparatorPrefixTree<'/'> & m_fsTree;
-};
diff --git a/libraries/logic/pathmatcher/IPathMatcher.h b/libraries/logic/pathmatcher/IPathMatcher.h
deleted file mode 100644
index 1d410947..00000000
--- a/libraries/logic/pathmatcher/IPathMatcher.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <memory>
-
-class IPathMatcher
-{
-public:
-	typedef std::shared_ptr<IPathMatcher> Ptr;
-
-public:
-	virtual ~IPathMatcher(){};
-	virtual bool matches(const QString &string) const = 0;
-};
diff --git a/libraries/logic/pathmatcher/MultiMatcher.h b/libraries/logic/pathmatcher/MultiMatcher.h
deleted file mode 100644
index 91f70aa4..00000000
--- a/libraries/logic/pathmatcher/MultiMatcher.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "IPathMatcher.h"
-#include <SeparatorPrefixTree.h>
-#include <QRegularExpression>
-
-class MultiMatcher : public IPathMatcher
-{
-public:
-	virtual ~MultiMatcher() {};
-	MultiMatcher()
-	{
-	}
-	MultiMatcher &add(Ptr add)
-	{
-		m_matchers.append(add);
-		return *this;
-	}
-
-	virtual bool matches(const QString &string) const override
-	{
-		for(auto iter: m_matchers)
-		{
-			if(iter->matches(string))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	QList<Ptr> m_matchers;
-};
diff --git a/libraries/logic/pathmatcher/RegexpMatcher.h b/libraries/logic/pathmatcher/RegexpMatcher.h
deleted file mode 100644
index da552123..00000000
--- a/libraries/logic/pathmatcher/RegexpMatcher.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "IPathMatcher.h"
-#include <QRegularExpression>
-
-class RegexpMatcher : public IPathMatcher
-{
-public:
-	virtual ~RegexpMatcher() {};
-	RegexpMatcher(const QString &regexp)
-	{
-		m_regexp.setPattern(regexp);
-		m_onlyFilenamePart = !regexp.contains('/');
-	}
-
-	RegexpMatcher &caseSensitive(bool cs = true)
-	{
-		if(cs)
-		{
-			m_regexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-		}
-		else
-		{
-			m_regexp.setPatternOptions(QRegularExpression::NoPatternOption);
-		}
-		return *this;
-	}
-
-	virtual bool matches(const QString &string) const override
-	{
-		if(m_onlyFilenamePart)
-		{
-			auto slash = string.lastIndexOf('/');
-			if(slash != -1)
-			{
-				auto part = string.mid(slash + 1);
-				return m_regexp.match(part).hasMatch();
-			}
-		}
-		return m_regexp.match(string).hasMatch();
-	}
-	QRegularExpression m_regexp;
-	bool m_onlyFilenamePart = false;
-};
diff --git a/libraries/logic/resources/Resource.cpp b/libraries/logic/resources/Resource.cpp
deleted file mode 100644
index e95675d7..00000000
--- a/libraries/logic/resources/Resource.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "Resource.h"
-
-#include <QDebug>
-
-#include "ResourceObserver.h"
-#include "ResourceHandler.h"
-
-// definition of static members of Resource
-QMap<QString, std::function<std::shared_ptr<ResourceHandler>(const QString &)>> Resource::m_handlers;
-QMap<QPair<int, int>, std::function<QVariant(QVariant)>> Resource::m_transfomers;
-QMap<QString, std::weak_ptr<Resource>> Resource::m_resources;
-
-struct NullResourceResult {};
-Q_DECLARE_METATYPE(NullResourceResult)
-class NullResourceHandler : public ResourceHandler
-{
-public:
-	explicit NullResourceHandler()
-	{
-		setResult(QVariant::fromValue<NullResourceResult>(NullResourceResult()));
-	}
-};
-
-Resource::Resource(const QString &resource)
-	: m_resource(resource)
-{
-	if (!resource.isEmpty())
-	{
-		// a valid resource identifier has the format <id>:<data>
-		Q_ASSERT(resource.contains(':'));
-		// "parse" the resource identifier into id and data
-		const QString resourceId = resource.left(resource.indexOf(':'));
-		const QString resourceData = resource.mid(resource.indexOf(':') + 1);
-
-		// create and set up the handler
-		Q_ASSERT(m_handlers.contains(resourceId));
-		m_handler = m_handlers.value(resourceId)(resourceData);
-	}
-	else
-	{
-		m_handler = std::make_shared<NullResourceHandler>();
-	}
-
-	Q_ASSERT(m_handler);
-	m_handler->init(m_handler);
-	m_handler->setResource(this);
-}
-Resource::~Resource()
-{
-	qDeleteAll(m_observers);
-}
-
-Resource::Ptr Resource::create(const QString &resource, Ptr placeholder)
-{
-	const QString storageId = storageIdentifier(resource, placeholder);
-
-	// do we already have a resource? even if m_resources contains it it might not be valid any longer (weak_ptr)
-	Resource::Ptr ptr = m_resources.contains(storageId)
-			? m_resources.value(storageId).lock()
-			: nullptr;
-	// did we have one? and is it still valid?
-	if (!ptr)
-	{
-		/* We don't want Resource to have a public constructor, but std::make_shared needs it,
-		 * so we create a subclass of Resource here that exposes the constructor as public.
-		 * The alternative would be making the allocator for std::make_shared a friend, but it
-		 * differs between different STL implementations, so that would be a pain.
-		 */
-		struct ConstructableResource : public Resource
-		{
-			explicit ConstructableResource(const QString &resource)
-				: Resource(resource) {}
-		};
-		ptr = std::make_shared<ConstructableResource>(resource);
-		ptr->m_placeholder = placeholder;
-		m_resources.insert(storageId, ptr);
-	}
-	return ptr;
-}
-
-Resource::Ptr Resource::applyTo(ResourceObserver *observer)
-{
-	m_observers.append(observer);
-	observer->setSource(shared_from_this()); // give the observer a shared_ptr for us so we don't get deleted
-	observer->resourceUpdated(); // ask the observer to poll us immediently, we might already have data
-	return shared_from_this(); // allow chaining
-}
-Resource::Ptr Resource::applyTo(QObject *target, const char *property)
-{
-	// the cast to ResourceObserver* is required to ensure the right overload gets choosen,
-	// since QObjectResourceObserver also inherits from QObject
-	return applyTo(static_cast<ResourceObserver *>(new QObjectResourceObserver(target, property)));
-}
-
-QVariant Resource::getResourceInternal(const int typeId) const
-{
-	// no result (yet), but a placeholder? delegate to the placeholder.
-	if (m_handler->result().isNull() && m_placeholder)
-	{
-		return m_placeholder->getResourceInternal(typeId);
-	}
-	const QVariant variant = m_handler->result();
-	const auto typePair = qMakePair(int(variant.type()), typeId);
-
-	// do we have an explicit transformer? use it.
-	if (m_transfomers.contains(typePair))
-	{
-		return m_transfomers.value(typePair)(variant);
-	}
-	else
-	{
-		// we do not have an explicit transformer, so we just pass the QVariant, which will automatically
-		// transform some types for us (different numbers to each other etc.)
-		return variant;
-	}
-}
-
-void Resource::reportResult()
-{
-	for (ResourceObserver *observer : m_observers)
-	{
-		observer->resourceUpdated();
-	}
-}
-void Resource::reportFailure(const QString &reason)
-{
-	for (ResourceObserver *observer : m_observers)
-	{
-		observer->setFailure(reason);
-	}
-}
-void Resource::reportProgress(const int progress)
-{
-	for (ResourceObserver *observer : m_observers)
-	{
-		observer->setProgress(progress);
-	}
-}
-
-void Resource::notifyObserverDeleted(ResourceObserver *observer)
-{
-	m_observers.removeAll(observer);
-}
-
-QString Resource::storageIdentifier(const QString &id, Resource::Ptr placeholder)
-{
-	if (placeholder)
-	{
-		return id + '#' + storageIdentifier(placeholder->m_resource, placeholder->m_placeholder);
-	}
-	else
-	{
-		return id;
-	}
-}
diff --git a/libraries/logic/resources/Resource.h b/libraries/logic/resources/Resource.h
deleted file mode 100644
index 63e97b88..00000000
--- a/libraries/logic/resources/Resource.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QMap>
-#include <QVariant>
-#include <functional>
-#include <memory>
-
-#include "ResourceObserver.h"
-#include "TypeMagic.h"
-
-#include "multimc_logic_export.h"
-
-class ResourceHandler;
-
-/** Frontend class for resources
- *
- * Usage:
- *	Resource::create("icon:noaccount")->applyTo(accountsAction);
- *	Resource::create("web:http://asdf.com/image.png")->applyTo(imageLbl)->placeholder(Resource::create("icon:loading"));
- *
- * Memory management:
- *	Resource caches ResourcePtrs using weak pointers, so while a resource is still existing
- *	when a new resource is created the resources will be the same (including the same handler).
- *
- *	ResourceObservers keep a shared pointer to the resource, as does the Resource itself to it's
- *	placeholder (if present). This means a resource stays valid while it's still used ("applied to" etc.)
- *	by something. When nothing uses it anymore it gets deleted.
- *
- *	@note Always pass resource around using Resource::Ptr! Copy and move constructors are disabled for a reason.
- */
-class MULTIMC_LOGIC_EXPORT Resource : public std::enable_shared_from_this<Resource>
-{
-	// only allow creation from Resource::create and disallow passing around non-pointers
-	explicit Resource(const QString &resource);
-	Resource(const Resource &) = delete;
-	Resource(Resource &&) = delete;
-public:
-	using Ptr = std::shared_ptr<Resource>;
-
-	~Resource();
-
-	/// The returned pointer needs to be stored until either Resource::applyTo or Resource::then is called, or it is passed as
-	/// a placeholder to Resource::create itself.
-	static Ptr create(const QString &resource, Ptr placeholder = nullptr);
-
-	/// Use these functions to specify what should happen when e.g. the resource changes
-	Ptr applyTo(ResourceObserver *observer);
-	Ptr applyTo(QObject *target, const char *property = nullptr);
-	template<typename Func>
-	Ptr then(Func &&func)
-	{
-		// Arg will be the functions argument with references and cv-qualifiers (const, volatile) removed
-		using Arg = TypeMagic::CleanType<typename TypeMagic::Function<Func>::Argument>;
-		// Ret will be the functions return type
-		using Ret = typename TypeMagic::Function<Func>::ReturnType;
-
-		// FunctionResourceObserver<ReturnType, ArgumentType, FunctionSignature>
-		return applyTo(new FunctionResourceObserver<Ret, Arg, Func>(std::forward<Func>(func)));
-	}
-
-	/// Retrieve the currently active resource. If it's type is different from T a conversion will be attempted.
-	template<typename T>
-	T getResource() const { return getResourceInternal(qMetaTypeId<T>()).template value<T>(); }
-
-	/// @internal Used by ResourceObserver and ResourceProxyModel
-	QVariant getResourceInternal(const int typeId) const;
-
-	/** Register a new ResourceHandler. T needs to inherit from ResourceHandler
-	 * Usage: Resource::registerHandler<MyResourceHandler>("myid");
-	 */
-	template<typename T>
-	static void registerHandler(const QString &id)
-	{
-		m_handlers.insert(id, [](const QString &res) { return std::make_shared<T>(res); });
-	}
-	/** Register a new resource transformer
-	 * Resource transformers are functions that are responsible for converting between different types,
-	 * for example converting from a QByteArray to a QPixmap. They are registered "externally" because not
-	 * all types might be available in this library, for example gui types like QPixmap.
-	 *
-	 * Usage: Resource::registerTransformer([](const InputType &type) { return OutputType(type); });
-	 *   This assumes that OutputType has a constructor that takes InputType as an argument. More
-	 *   complicated transformers can of course also be registered.
-	 *
-	 * When a ResourceObserver requests a type that's different from the actual resource type, a matching
-	 * transformer will be looked up from the list of transformers.
-	 * @note Only one-stage transforms will be performed (you can't registerTransformers for QString => int
-	 *       and int => float and expect QString to automatically be transformed into a float.
-	 */
-	template<typename Func>
-	static void registerTransformer(Func &&func)
-	{
-		using Out = typename TypeMagic::Function<Func>::ReturnType;
-		using In = TypeMagic::CleanType<typename TypeMagic::Function<Func>::Argument>;
-		static_assert(!std::is_same<Out, In>::value, "It does not make sense to transform a value to itself");
-		m_transfomers.insert(qMakePair(qMetaTypeId<In>(), qMetaTypeId<Out>()), [func](const QVariant &in)
-		{
-			return QVariant::fromValue<Out>(func(in.value<In>()));
-		});
-	}
-
-private: // half private, implementation details
-	friend class ResourceHandler;
-	// the following three functions are called by ResourceHandlers
-	/** Notifies the observers. They will call Resource::getResourceInternal which will call ResourceHandler::result
-	 * or delegate to it's placeholder.
-	 */
-	void reportResult();
-	void reportFailure(const QString &reason);
-	void reportProgress(const int progress);
-
-	friend class ResourceObserver;
-	/// Removes observer from the list of observers so that we don't attempt to notify something that doesn't exist
-	void notifyObserverDeleted(ResourceObserver *observer);
-
-private: // truly private
-	QList<ResourceObserver *> m_observers;
-	std::shared_ptr<ResourceHandler> m_handler = nullptr;
-	Ptr m_placeholder = nullptr;
-	const QString m_resource;
-
-	static QString storageIdentifier(const QString &id, Ptr placeholder = nullptr);
-	QString storageIdentifier() const;
-
-	// a list of resource handler factories, registered using registerHandler
-	static QMap<QString, std::function<std::shared_ptr<ResourceHandler>(const QString &)>> m_handlers;
-	// a list of resource transformers, registered using registerTransformer
-	static QMap<QPair<int, int>, std::function<QVariant(QVariant)>> m_transfomers;
-	// a list of resources so that we can reuse them
-	static QMap<QString, std::weak_ptr<Resource>> m_resources;
-};
diff --git a/libraries/logic/resources/ResourceHandler.cpp b/libraries/logic/resources/ResourceHandler.cpp
deleted file mode 100644
index 46a4422c..00000000
--- a/libraries/logic/resources/ResourceHandler.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "ResourceHandler.h"
-
-#include "Resource.h"
-
-void ResourceHandler::setResult(const QVariant &result)
-{
-	m_result = result;
-	if (m_resource)
-	{
-		m_resource->reportResult();
-	}
-}
-
-void ResourceHandler::setFailure(const QString &reason)
-{
-	if (m_resource)
-	{
-		m_resource->reportFailure(reason);
-	}
-}
-
-void ResourceHandler::setProgress(const int progress)
-{
-	if (m_resource)
-	{
-		m_resource->reportProgress(progress);
-	}
-}
diff --git a/libraries/logic/resources/ResourceHandler.h b/libraries/logic/resources/ResourceHandler.h
deleted file mode 100644
index f09d8904..00000000
--- a/libraries/logic/resources/ResourceHandler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <QVariant>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class Resource;
-
-/** Base class for things that can retrieve a resource.
- *
- * Subclass, provide a constructor that takes a single QString as argument, and
- * call Resource::registerHandler<MyResourceHandler>("<id>"), where <id> is the
- * prefix of the resource ("web", "icon", etc.)
- */
-class MULTIMC_LOGIC_EXPORT ResourceHandler
-{
-public:
-	virtual ~ResourceHandler() {}
-
-	void setResource(Resource *resource) { m_resource = resource; }
-	/// reimplement this if you need to do something after you have been put in a shared pointer
-	// we do this instead of inheriting from std::enable_shared_from_this
-	virtual void init(std::shared_ptr<ResourceHandler>&) {}
-
-	QVariant result() const { return m_result; }
-
-protected: // use these methods to notify the resource of changes
-	void setResult(const QVariant &result);
-	void setFailure(const QString &reason);
-	void setProgress(const int progress);
-
-private:
-	QVariant m_result;
-	Resource *m_resource = nullptr;
-};
diff --git a/libraries/logic/resources/ResourceObserver.cpp b/libraries/logic/resources/ResourceObserver.cpp
deleted file mode 100644
index 4f168fd2..00000000
--- a/libraries/logic/resources/ResourceObserver.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "ResourceObserver.h"
-
-#include <QDebug>
-
-#include "Resource.h"
-
-static const char *defaultPropertyForTarget(QObject *target)
-{
-	if (target->inherits("QLabel"))
-	{
-		return "pixmap";
-	}
-	else if (target->inherits("QAction") ||
-			 target->inherits("QMenu") ||
-			 target->inherits("QAbstractButton"))
-	{
-		return "icon";
-	}
-	// for unit tests
-	else if (target->inherits("DummyObserverObject"))
-	{
-		return "property";
-	}
-	else
-	{
-		Q_ASSERT_X(false, "ResourceObserver.cpp: defaultPropertyForTarget", "Unrecognized QObject subclass");
-		return nullptr;
-	}
-}
-
-QObjectResourceObserver::QObjectResourceObserver(QObject *target, const char *property)
-	: QObject(target), m_target(target)
-{
-	const QMetaObject *mo = m_target->metaObject();
-	m_property = mo->property(mo->indexOfProperty(
-								  property ?
-									  property
-									: defaultPropertyForTarget(target)));
-}
-void QObjectResourceObserver::resourceUpdated()
-{
-	m_property.write(m_target, getInternal(m_property.type()));
-}
-
-
-ResourceObserver::~ResourceObserver()
-{
-	m_resource->notifyObserverDeleted(this);
-}
-
-QVariant ResourceObserver::getInternal(const int typeId) const
-{
-	Q_ASSERT(m_resource);
-	return m_resource->getResourceInternal(typeId);
-}
diff --git a/libraries/logic/resources/ResourceObserver.h b/libraries/logic/resources/ResourceObserver.h
deleted file mode 100644
index c42e41ba..00000000
--- a/libraries/logic/resources/ResourceObserver.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <functional>
-
-#include <QObject>
-#include <QMetaProperty>
-#include "multimc_logic_export.h"
-
-class QVariant;
-class Resource;
-
-/// Base class for things that can use a resource
-class MULTIMC_LOGIC_EXPORT ResourceObserver
-{
-public:
-	virtual ~ResourceObserver();
-
-protected: // these methods are called by the Resource when something changes
-	virtual void resourceUpdated() = 0;
-	virtual void setFailure(const QString &) {}
-	virtual void setProgress(const int) {}
-
-private:
-	friend class Resource;
-	void setSource(std::shared_ptr<Resource> resource) { m_resource = resource; }
-
-protected:
-	template<typename T>
-	T get() const { return getInternal(qMetaTypeId<T>()).template value<T>(); }
-	QVariant getInternal(const int typeId) const;
-
-private:
-	std::shared_ptr<Resource> m_resource;
-};
-
-/** Observer for QObject properties
- *
- * Give it a target and the name of a property, and that property will be set when the resource changes.
- *
- * If no name is given an attempt to find a default property for some common classes is done.
- */
-class MULTIMC_LOGIC_EXPORT QObjectResourceObserver : public QObject, public ResourceObserver
-{
-public:
-	explicit QObjectResourceObserver(QObject *target, const char *property = nullptr);
-
-	void resourceUpdated() override;
-
-private:
-	QObject *m_target;
-	QMetaProperty m_property;
-};
-
-/** Observer for functions, lambdas etc.
- * Template arguments:
- *   * We need Ret and Arg in order to create the std::function
- *   * We need Func in order to std::forward the function
- */
-template <typename Ret, typename Arg, typename Func>
-class FunctionResourceObserver : public ResourceObserver
-{
-	std::function<Ret(Arg)> m_function;
-public:
-	template <typename T>
-	explicit FunctionResourceObserver(T &&func)
-		: m_function(std::forward<Func>(func)) {}
-
-	void resourceUpdated() override
-	{
-		m_function(get<Arg>());
-	}
-};
diff --git a/libraries/logic/resources/ResourceProxyModel.cpp b/libraries/logic/resources/ResourceProxyModel.cpp
deleted file mode 100644
index f026d9a9..00000000
--- a/libraries/logic/resources/ResourceProxyModel.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "ResourceProxyModel.h"
-
-#include <QItemSelectionRange>
-
-#include "Resource.h"
-#include "ResourceObserver.h"
-
-class ModelResourceObserver : public ResourceObserver
-{
-public:
-	explicit ModelResourceObserver(const QModelIndex &index, const int role)
-		: m_index(index), m_role(role)
-	{
-		qRegisterMetaType<QVector<int>>("QVector<int>");
-	}
-
-	void resourceUpdated() override
-	{
-		if (m_index.isValid())
-		{
-			// the resource changed, pretend to be the model and notify the views of the update. they will re-poll the model which will return the new resource value
-			QMetaObject::invokeMethod(const_cast<QAbstractItemModel *>(m_index.model()),
-									  "dataChanged", Qt::QueuedConnection,
-									  Q_ARG(QModelIndex, m_index), Q_ARG(QModelIndex, m_index), Q_ARG(QVector<int>, QVector<int>() << m_role));
-		}
-	}
-
-private:
-	QPersistentModelIndex m_index;
-	int m_role;
-};
-
-ResourceProxyModel::ResourceProxyModel(const int resultTypeId, QObject *parent)
-	: QIdentityProxyModel(parent), m_resultTypeId(resultTypeId)
-{
-}
-
-QVariant ResourceProxyModel::data(const QModelIndex &proxyIndex, int role) const
-{
-	const QModelIndex mapped = mapToSource(proxyIndex);
-	// valid cell that's a Qt::DecorationRole and that contains a non-empty string
-	if (mapped.isValid() && role == Qt::DecorationRole && !mapToSource(proxyIndex).data(role).toString().isEmpty())
-	{
-		// do we already have a resource for this index?
-		if (!m_resources.contains(mapped))
-		{
-			Resource::Ptr placeholder;
-			const QVariant placeholderIdentifier = mapped.data(PlaceholderRole);
-			if (!placeholderIdentifier.isNull() && placeholderIdentifier.type() == QVariant::String)
-			{
-				placeholder = Resource::create(placeholderIdentifier.toString());
-			}
-
-			// create the Resource and apply the observer for models
-			Resource::Ptr res = Resource::create(mapToSource(proxyIndex).data(role).toString(), placeholder)
-					->applyTo(new ModelResourceObserver(proxyIndex, role));
-
-			m_resources.insert(mapped, res);
-		}
-
-		return m_resources.value(mapped)->getResourceInternal(m_resultTypeId);
-	}
-	// otherwise fall back to the source model
-	return mapped.data(role);
-}
-
-void ResourceProxyModel::setSourceModel(QAbstractItemModel *model)
-{
-	if (sourceModel())
-	{
-		disconnect(sourceModel(), 0, this, 0);
-	}
-	if (model)
-	{
-		connect(model, &QAbstractItemModel::dataChanged, this, [this](const QModelIndex &tl, const QModelIndex &br, const QVector<int> &roles)
-		{
-			// invalidate resources so that they will be re-created
-			if (roles.contains(Qt::DecorationRole) || roles.contains(PlaceholderRole) || roles.isEmpty())
-			{
-				const QItemSelectionRange range(tl, br);
-				for (const QModelIndex &index : range.indexes())
-				{
-					m_resources.remove(index);
-				}
-			}
-		});
-	}
-	QIdentityProxyModel::setSourceModel(model);
-}
diff --git a/libraries/logic/resources/ResourceProxyModel.h b/libraries/logic/resources/ResourceProxyModel.h
deleted file mode 100644
index 98a3dbd1..00000000
--- a/libraries/logic/resources/ResourceProxyModel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <QIdentityProxyModel>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-/// Convenience proxy model that transforms resource identifiers (strings) for Qt::DecorationRole into other types.
-class MULTIMC_LOGIC_EXPORT ResourceProxyModel : public QIdentityProxyModel
-{
-	Q_OBJECT
-public:
-	// resultTypeId is found using qMetaTypeId<T>()
-	explicit ResourceProxyModel(const int resultTypeId, QObject *parent = nullptr);
-
-	enum
-	{
-		// provide this role from your model if you want to show a placeholder
-		PlaceholderRole = Qt::UserRole + 0xabc // some random offset to not collide with other stuff
-	};
-
-	QVariant data(const QModelIndex &proxyIndex, int role) const override;
-	void setSourceModel(QAbstractItemModel *model) override;
-
-	/// Helper function, usage: m_view->setModel(ResourceProxyModel::mixin<QIcon>(m_model));
-	template <typename T>
-	static QAbstractItemModel *mixin(QAbstractItemModel *model)
-	{
-		ResourceProxyModel *proxy = new ResourceProxyModel(qMetaTypeId<T>(), model);
-		proxy->setSourceModel(model);
-		return proxy;
-	}
-
-private:
-	// mutable because it needs to be available from the const data()
-	mutable QMap<QPersistentModelIndex, std::shared_ptr<class Resource>> m_resources;
-
-	const int m_resultTypeId;
-};
diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.cpp b/libraries/logic/screenshots/ImgurAlbumCreation.cpp
deleted file mode 100644
index e009ef4d..00000000
--- a/libraries/logic/screenshots/ImgurAlbumCreation.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "ImgurAlbumCreation.h"
-
-#include <QNetworkRequest>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QUrl>
-#include <QStringList>
-
-#include "net/URLConstants.h"
-#include "Env.h"
-#include <QDebug>
-
-ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots)
-{
-	m_url = URLConstants::IMGUR_BASE_URL + "album.json";
-	m_status = Job_NotStarted;
-}
-
-void ImgurAlbumCreation::start()
-{
-	m_status = Job_InProgress;
-	QNetworkRequest request(m_url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-	request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-	request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
-	request.setRawHeader("Accept", "application/json");
-
-	QStringList ids;
-	for (auto shot : m_screenshots)
-	{
-		ids.append(shot->m_imgurId);
-	}
-
-	const QByteArray data = "ids=" + ids.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->post(request, data);
-
-	m_reply.reset(rep);
-	connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress);
-	connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished);
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-}
-void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
-{
-	qDebug() << m_reply->errorString();
-	m_status = Job_Failed;
-}
-void ImgurAlbumCreation::downloadFinished()
-{
-	if (m_status != Job_Failed)
-	{
-		QByteArray data = m_reply->readAll();
-		m_reply.reset();
-		QJsonParseError jsonError;
-		QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-		if (jsonError.error != QJsonParseError::NoError)
-		{
-			qDebug() << jsonError.errorString();
-			emit failed(m_index_within_job);
-			return;
-		}
-		auto object = doc.object();
-		if (!object.value("success").toBool())
-		{
-			qDebug() << doc.toJson();
-			emit failed(m_index_within_job);
-			return;
-		}
-		m_deleteHash = object.value("data").toObject().value("deletehash").toString();
-		m_id = object.value("data").toObject().value("id").toString();
-		m_status = Job_Finished;
-		emit succeeded(m_index_within_job);
-		return;
-	}
-	else
-	{
-		qDebug() << m_reply->readAll();
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-}
-void ImgurAlbumCreation::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.h b/libraries/logic/screenshots/ImgurAlbumCreation.h
deleted file mode 100644
index 469174e4..00000000
--- a/libraries/logic/screenshots/ImgurAlbumCreation.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-#include "net/NetAction.h"
-#include "Screenshot.h"
-
-#include "multimc_logic_export.h"
-
-typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
-class MULTIMC_LOGIC_EXPORT ImgurAlbumCreation : public NetAction
-{
-public:
-	explicit ImgurAlbumCreation(QList<ScreenshotPtr> screenshots);
-	static ImgurAlbumCreationPtr make(QList<ScreenshotPtr> screenshots)
-	{
-		return ImgurAlbumCreationPtr(new ImgurAlbumCreation(screenshots));
-	}
-
-	QString deleteHash() const
-	{
-		return m_deleteHash;
-	}
-	QString id() const
-	{
-		return m_id;
-	}
-
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	virtual void downloadError(QNetworkReply::NetworkError error);
-	virtual void downloadFinished();
-	virtual void downloadReadyRead()
-	{
-	}
-
-public
-slots:
-	virtual void start();
-
-private:
-	QList<ScreenshotPtr> m_screenshots;
-
-	QString m_deleteHash;
-	QString m_id;
-};
diff --git a/libraries/logic/screenshots/ImgurUpload.cpp b/libraries/logic/screenshots/ImgurUpload.cpp
deleted file mode 100644
index 48e0ec18..00000000
--- a/libraries/logic/screenshots/ImgurUpload.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "ImgurUpload.h"
-
-#include <QNetworkRequest>
-#include <QHttpMultiPart>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QHttpPart>
-#include <QFile>
-#include <QUrl>
-
-#include "net/URLConstants.h"
-#include "Env.h"
-#include <QDebug>
-
-ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot)
-{
-	m_url = URLConstants::IMGUR_BASE_URL + "upload.json";
-	m_status = Job_NotStarted;
-}
-
-void ImgurUpload::start()
-{
-	finished = false;
-	m_status = Job_InProgress;
-	QNetworkRequest request(m_url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
-	request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
-	request.setRawHeader("Accept", "application/json");
-
-	QFile f(m_shot->m_file.absoluteFilePath());
-	if (!f.open(QFile::ReadOnly))
-	{
-		emit failed(m_index_within_job);
-		return;
-	}
-
-	QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-	QHttpPart filePart;
-	filePart.setBody(f.readAll().toBase64());
-	filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
-	filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\"");
-	multipart->append(filePart);
-	QHttpPart typePart;
-	typePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"type\"");
-	typePart.setBody("base64");
-	multipart->append(typePart);
-	QHttpPart namePart;
-	namePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"name\"");
-	namePart.setBody(m_shot->m_file.baseName().toUtf8());
-	multipart->append(namePart);
-
-	auto worker = ENV.qnam();
-	QNetworkReply *rep = worker->post(request, multipart);
-
-	m_reply.reset(rep);
-	connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress);
-	connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished);
-	connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
-			SLOT(downloadError(QNetworkReply::NetworkError)));
-}
-void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
-{
-	qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
-	if(finished)
-	{
-		qCritical() << "Double finished ImgurUpload!";
-		return;
-	}
-	m_status = Job_Failed;
-	finished = true;
-	m_reply.reset();
-	emit failed(m_index_within_job);
-}
-void ImgurUpload::downloadFinished()
-{
-	if(finished)
-	{
-		qCritical() << "Double finished ImgurUpload!";
-		return;
-	}
-	QByteArray data = m_reply->readAll();
-	m_reply.reset();
-	QJsonParseError jsonError;
-	QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
-		finished = true;
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-	auto object = doc.object();
-	if (!object.value("success").toBool())
-	{
-		qDebug() << "Screenshot upload not successful:" << doc.toJson();
-		finished = true;
-		m_reply.reset();
-		emit failed(m_index_within_job);
-		return;
-	}
-	m_shot->m_imgurId = object.value("data").toObject().value("id").toString();
-	m_shot->m_url = object.value("data").toObject().value("link").toString();
-	m_status = Job_Finished;
-	finished = true;
-	emit succeeded(m_index_within_job);
-	return;
-}
-void ImgurUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-	m_total_progress = bytesTotal;
-	m_progress = bytesReceived;
-	emit netActionProgress(m_index_within_job, bytesReceived, bytesTotal);
-}
diff --git a/libraries/logic/screenshots/ImgurUpload.h b/libraries/logic/screenshots/ImgurUpload.h
deleted file mode 100644
index 0a766b8f..00000000
--- a/libraries/logic/screenshots/ImgurUpload.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-#include "net/NetAction.h"
-#include "Screenshot.h"
-
-#include "multimc_logic_export.h"
-
-typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr;
-class MULTIMC_LOGIC_EXPORT ImgurUpload : public NetAction
-{
-public:
-	explicit ImgurUpload(ScreenshotPtr shot);
-	static ImgurUploadPtr make(ScreenshotPtr shot)
-	{
-		return ImgurUploadPtr(new ImgurUpload(shot));
-	}
-
-protected
-slots:
-	virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-	virtual void downloadError(QNetworkReply::NetworkError error);
-	virtual void downloadFinished();
-	virtual void downloadReadyRead()
-	{
-	}
-
-public
-slots:
-	virtual void start();
-
-private:
-	ScreenshotPtr m_shot;
-	bool finished = true;
-};
diff --git a/libraries/logic/screenshots/Screenshot.h b/libraries/logic/screenshots/Screenshot.h
deleted file mode 100644
index b48cbe99..00000000
--- a/libraries/logic/screenshots/Screenshot.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <QDateTime>
-#include <QString>
-#include <QFileInfo>
-#include <memory>
-
-struct ScreenShot
-{
-	ScreenShot(QFileInfo file)
-	{
-		m_file = file;
-	}
-	QFileInfo m_file;
-	QString m_url;
-	QString m_imgurId;
-};
-
-typedef std::shared_ptr<ScreenShot> ScreenshotPtr;
diff --git a/libraries/logic/settings/INIFile.cpp b/libraries/logic/settings/INIFile.cpp
deleted file mode 100644
index 69a6b87e..00000000
--- a/libraries/logic/settings/INIFile.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "settings/INIFile.h"
-#include <FileSystem.h>
-
-#include <QFile>
-#include <QTextStream>
-#include <QStringList>
-#include <QSaveFile>
-#include <QDebug>
-
-INIFile::INIFile()
-{
-}
-
-QString INIFile::unescape(QString orig)
-{
-	QString out;
-	QChar prev = 0;
-	for(auto c: orig)
-	{
-		if(prev == '\\')
-		{
-			if(c == 'n')
-				out += '\n';
-			else if (c == 't')
-				out += '\t';
-			else
-				out += c;
-			prev = 0;
-		}
-		else
-		{
-			if(c == '\\')
-			{
-				prev = c;
-				continue;
-			}
-			out += c;
-			prev = 0;
-		}
-	}
-	return out;
-}
-
-QString INIFile::escape(QString orig)
-{
-	QString out;
-	for(auto c: orig)
-	{
-		if(c == '\n')
-			out += "\\n";
-		else if (c == '\t')
-			out += "\\t";
-		else if(c == '\\')
-			out += "\\\\";
-		else
-			out += c;
-	}
-	return out;
-}
-
-bool INIFile::saveFile(QString fileName)
-{
-	QByteArray outArray;
-	for (Iterator iter = begin(); iter != end(); iter++)
-	{
-		QString value = iter.value().toString();
-		value = escape(value);
-		outArray.append(iter.key().toUtf8());
-		outArray.append('=');
-		outArray.append(value.toUtf8());
-		outArray.append('\n');
-	}
-
-	try
-	{
-		FS::write(fileName, outArray);
-	}
-	catch (Exception & e)
-	{
-		qCritical() << e.what();
-		return false;
-	}
-
-	return true;
-}
-
-
-bool INIFile::loadFile(QString fileName)
-{
-	QFile file(fileName);
-	if (!file.open(QIODevice::ReadOnly))
-		return false;
-	bool success = loadFile(file.readAll());
-	file.close();
-	return success;
-}
-
-bool INIFile::loadFile(QByteArray file)
-{
-	QTextStream in(file);
-	in.setCodec("UTF-8");
-
-	QStringList lines = in.readAll().split('\n');
-	for (int i = 0; i < lines.count(); i++)
-	{
-		QString &lineRaw = lines[i];
-		// Ignore comments.
-		QString line = lineRaw.left(lineRaw.indexOf('#')).trimmed();
-
-		int eqPos = line.indexOf('=');
-		if (eqPos == -1)
-			continue;
-		QString key = line.left(eqPos).trimmed();
-		QString valueStr = line.right(line.length() - eqPos - 1).trimmed();
-
-		valueStr = unescape(valueStr);
-
-		QVariant value(valueStr);
-		this->operator[](key) = value;
-	}
-
-	return true;
-}
-
-QVariant INIFile::get(QString key, QVariant def) const
-{
-	if (!this->contains(key))
-		return def;
-	else
-		return this->operator[](key);
-}
-
-void INIFile::set(QString key, QVariant val)
-{
-	this->operator[](key) = val;
-}
diff --git a/libraries/logic/settings/INIFile.h b/libraries/logic/settings/INIFile.h
deleted file mode 100644
index 5013eb2d..00000000
--- a/libraries/logic/settings/INIFile.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QVariant>
-#include <QIODevice>
-
-#include "multimc_logic_export.h"
-
-// Sectionless INI parser (for instance config files)
-class MULTIMC_LOGIC_EXPORT INIFile : public QMap<QString, QVariant>
-{
-public:
-	explicit INIFile();
-
-	bool loadFile(QByteArray file);
-	bool loadFile(QString fileName);
-	bool saveFile(QString fileName);
-
-	QVariant get(QString key, QVariant def) const;
-	void set(QString key, QVariant val);
-	static QString unescape(QString orig);
-	static QString escape(QString orig);
-};
diff --git a/libraries/logic/settings/INISettingsObject.cpp b/libraries/logic/settings/INISettingsObject.cpp
deleted file mode 100644
index 5ccc7446..00000000
--- a/libraries/logic/settings/INISettingsObject.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "INISettingsObject.h"
-#include "Setting.h"
-
-INISettingsObject::INISettingsObject(const QString &path, QObject *parent)
-	: SettingsObject(parent)
-{
-	m_filePath = path;
-	m_ini.loadFile(path);
-}
-
-void INISettingsObject::setFilePath(const QString &filePath)
-{
-	m_filePath = filePath;
-}
-
-bool INISettingsObject::reload()
-{
-	return m_ini.loadFile(m_filePath) && SettingsObject::reload();
-}
-
-void INISettingsObject::suspendSave()
-{
-	m_suspendSave = true;
-}
-
-void INISettingsObject::resumeSave()
-{
-	m_suspendSave = false;
-	if(m_doSave)
-	{
-		m_ini.saveFile(m_filePath);
-	}
-}
-
-void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
-{
-	if (contains(setting.id()))
-	{
-		// valid value -> set the main config, remove all the sysnonyms
-		if (value.isValid())
-		{
-			auto list = setting.configKeys();
-			m_ini.set(list.takeFirst(), value);
-			for(auto iter: list)
-				m_ini.remove(iter);
-		}
-		// invalid -> remove all (just like resetSetting)
-		else
-		{
-			for(auto iter: setting.configKeys())
-				m_ini.remove(iter);
-		}
-		doSave();
-	}
-}
-
-void INISettingsObject::doSave()
-{
-	if(m_suspendSave)
-	{
-		m_doSave = true;
-	}
-	else
-	{
-		m_ini.saveFile(m_filePath);
-	}
-}
-
-void INISettingsObject::resetSetting(const Setting &setting)
-{
-	// if we have the setting, remove all the synonyms. ALL OF THEM
-	if (contains(setting.id()))
-	{
-		for(auto iter: setting.configKeys())
-			m_ini.remove(iter);
-		doSave();
-	}
-}
-
-QVariant INISettingsObject::retrieveValue(const Setting &setting)
-{
-	// if we have the setting, return value of the first matching synonym
-	if (contains(setting.id()))
-	{
-		for(auto iter: setting.configKeys())
-		{
-			if(m_ini.contains(iter))
-				return m_ini[iter];
-		}
-	}
-	return QVariant();
-}
diff --git a/libraries/logic/settings/INISettingsObject.h b/libraries/logic/settings/INISettingsObject.h
deleted file mode 100644
index 4afa2a2c..00000000
--- a/libraries/logic/settings/INISettingsObject.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-
-#include "settings/INIFile.h"
-
-#include "settings/SettingsObject.h"
-
-#include "multimc_logic_export.h"
-
-/*!
- * \brief A settings object that stores its settings in an INIFile.
- */
-class MULTIMC_LOGIC_EXPORT INISettingsObject : public SettingsObject
-{
-	Q_OBJECT
-public:
-	explicit INISettingsObject(const QString &path, QObject *parent = 0);
-
-	/*!
-	 * \brief Gets the path to the INI file.
-	 * \return The path to the INI file.
-	 */
-	virtual QString filePath() const
-	{
-		return m_filePath;
-	}
-
-	/*!
-	 * \brief Sets the path to the INI file and reloads it.
-	 * \param filePath The INI file's new path.
-	 */
-	virtual void setFilePath(const QString &filePath);
-
-	bool reload() override;
-
-	void suspendSave() override;
-	void resumeSave() override;
-
-protected slots:
-	virtual void changeSetting(const Setting &setting, QVariant value) override;
-	virtual void resetSetting(const Setting &setting) override;
-
-protected:
-	virtual QVariant retrieveValue(const Setting &setting) override;
-	void doSave();
-
-protected:
-	INIFile m_ini;
-	QString m_filePath;
-};
diff --git a/libraries/logic/settings/OverrideSetting.cpp b/libraries/logic/settings/OverrideSetting.cpp
deleted file mode 100644
index 25162dff..00000000
--- a/libraries/logic/settings/OverrideSetting.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "OverrideSetting.h"
-
-OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate)
-	: Setting(other->configKeys(), QVariant())
-{
-	Q_ASSERT(other);
-	Q_ASSERT(gate);
-	m_other = other;
-	m_gate = gate;
-}
-
-bool OverrideSetting::isOverriding() const
-{
-	return m_gate->get().toBool();
-}
-
-QVariant OverrideSetting::defValue() const
-{
-	return m_other->get();
-}
-
-QVariant OverrideSetting::get() const
-{
-	if(isOverriding())
-	{
-		return Setting::get();
-	}
-	return m_other->get();
-}
-
-void OverrideSetting::reset()
-{
-	Setting::reset();
-}
-
-void OverrideSetting::set(QVariant value)
-{
-	Setting::set(value);
-}
diff --git a/libraries/logic/settings/OverrideSetting.h b/libraries/logic/settings/OverrideSetting.h
deleted file mode 100644
index 68595cde..00000000
--- a/libraries/logic/settings/OverrideSetting.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <memory>
-
-#include "Setting.h"
-
-/*!
- * \brief A setting that 'overrides another.'
- * This means that the setting's default value will be the value of another setting.
- * The other setting can be (and usually is) a part of a different SettingsObject
- * than this one.
- */
-class OverrideSetting : public Setting
-{
-	Q_OBJECT
-public:
-	explicit OverrideSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate);
-
-	virtual QVariant defValue() const;
-	virtual QVariant get() const;
-	virtual void set (QVariant value);
-	virtual void reset();
-
-private:
-	bool isOverriding() const;
-
-protected:
-	std::shared_ptr<Setting> m_other;
-	std::shared_ptr<Setting> m_gate;
-};
diff --git a/libraries/logic/settings/PassthroughSetting.cpp b/libraries/logic/settings/PassthroughSetting.cpp
deleted file mode 100644
index 45a560de..00000000
--- a/libraries/logic/settings/PassthroughSetting.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PassthroughSetting.h"
-
-PassthroughSetting::PassthroughSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate)
-	: Setting(other->configKeys(), QVariant())
-{
-	Q_ASSERT(other);
-	Q_ASSERT(gate);
-	m_other = other;
-	m_gate = gate;
-}
-
-bool PassthroughSetting::isOverriding() const
-{
-	return m_gate->get().toBool();
-}
-
-QVariant PassthroughSetting::defValue() const
-{
-	if(isOverriding())
-	{
-		return m_other->get();
-	}
-	return m_other->defValue();
-}
-
-QVariant PassthroughSetting::get() const
-{
-	if(isOverriding())
-	{
-		return Setting::get();
-	}
-	return m_other->get();
-}
-
-void PassthroughSetting::reset()
-{
-	if(isOverriding())
-	{
-		Setting::reset();
-	}
-	m_other->reset();
-}
-
-void PassthroughSetting::set(QVariant value)
-{
-	if(isOverriding())
-	{
-		Setting::set(value);
-	}
-	m_other->set(value);
-}
diff --git a/libraries/logic/settings/PassthroughSetting.h b/libraries/logic/settings/PassthroughSetting.h
deleted file mode 100644
index c4dc646c..00000000
--- a/libraries/logic/settings/PassthroughSetting.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <memory>
-
-#include "Setting.h"
-
-/*!
- * \brief A setting that 'overrides another.' based on the value of a 'gate' setting
- * If 'gate' evaluates to true, the override stores and returns data
- * If 'gate' evaluates to false, the original does,
- */
-class PassthroughSetting : public Setting
-{
-	Q_OBJECT
-public:
-	explicit PassthroughSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate);
-
-	virtual QVariant defValue() const;
-	virtual QVariant get() const;
-	virtual void set (QVariant value);
-	virtual void reset();
-
-private:
-	bool isOverriding() const;
-
-protected:
-	std::shared_ptr<Setting> m_other;
-	std::shared_ptr<Setting> m_gate;
-};
diff --git a/libraries/logic/settings/Setting.cpp b/libraries/logic/settings/Setting.cpp
deleted file mode 100644
index b17101a2..00000000
--- a/libraries/logic/settings/Setting.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Setting.h"
-#include "settings/SettingsObject.h"
-
-Setting::Setting(QStringList synonyms, QVariant defVal)
-	: QObject(), m_synonyms(synonyms), m_defVal(defVal)
-{
-}
-
-QVariant Setting::get() const
-{
-	SettingsObject *sbase = m_storage;
-	if (!sbase)
-	{
-		return defValue();
-	}
-	else
-	{
-		QVariant test = sbase->retrieveValue(*this);
-		if (!test.isValid())
-			return defValue();
-		return test;
-	}
-}
-
-QVariant Setting::defValue() const
-{
-	return m_defVal;
-}
-
-void Setting::set(QVariant value)
-{
-	emit SettingChanged(*this, value);
-}
-
-void Setting::reset()
-{
-	emit settingReset(*this);
-}
diff --git a/libraries/logic/settings/Setting.h b/libraries/logic/settings/Setting.h
deleted file mode 100644
index 6d53ac6d..00000000
--- a/libraries/logic/settings/Setting.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QVariant>
-#include <QStringList>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class SettingsObject;
-
-/*!
- *
- */
-class MULTIMC_LOGIC_EXPORT Setting : public QObject
-{
-	Q_OBJECT
-public:
-	/**
-	 * Construct a Setting
-	 *
-	 * Synonyms are all the possible names used in the settings object, in order of preference.
-	 * First synonym is the ID, which identifies the setting in MultiMC.
-	 *
-	 * defVal is the default value that will be returned when the settings object
-	 * doesn't have any value for this setting.
-	 */
-	explicit Setting(QStringList synonyms, QVariant defVal = QVariant());
-
-	/*!
-	 * \brief Gets this setting's ID.
-	 * This is used to refer to the setting within the application.
-	 * \warning Changing the ID while the setting is registered with a SettingsObject results in
-	 * undefined behavior.
-	 * \return The ID of the setting.
-	 */
-	virtual QString id() const
-	{
-		return m_synonyms.first();
-	}
-
-	/*!
-	 * \brief Gets this setting's config file key.
-	 * This is used to store the setting's value in the config file. It is usually
-	 * the same as the setting's ID, but it can be different.
-	 * \return The setting's config file key.
-	 */
-	virtual QStringList configKeys() const
-	{
-		return m_synonyms;
-	}
-
-	/*!
-	 * \brief Gets this setting's value as a QVariant.
-	 * This is done by calling the SettingsObject's retrieveValue() function.
-	 * If this Setting doesn't have a SettingsObject, this returns an invalid QVariant.
-	 * \return QVariant containing this setting's value.
-	 * \sa value()
-	 */
-	virtual QVariant get() const;
-
-	/*!
-	 * \brief Gets this setting's default value.
-	 * \return The default value of this setting.
-	 */
-	virtual QVariant defValue() const;
-
-signals:
-	/*!
-	 * \brief Signal emitted when this Setting object's value changes.
-	 * \param setting A reference to the Setting that changed.
-	 * \param value This Setting object's new value.
-	 */
-	void SettingChanged(const Setting &setting, QVariant value);
-
-	/*!
-	 * \brief Signal emitted when this Setting object's value resets to default.
-	 * \param setting A reference to the Setting that changed.
-	 */
-	void settingReset(const Setting &setting);
-
-public
-slots:
-	/*!
-	 * \brief Changes the setting's value.
-	 * This is done by emitting the SettingChanged() signal which will then be
-	 * handled by the SettingsObject object and cause the setting to change.
-	 * \param value The new value.
-	 */
-	virtual void set(QVariant value);
-
-	/*!
-	 * \brief Reset the setting to default
-	 * This is done by emitting the settingReset() signal which will then be
-	 * handled by the SettingsObject object and cause the setting to change.
-	 */
-	virtual void reset();
-
-protected:
-	friend class SettingsObject;
-	SettingsObject * m_storage;
-	QStringList m_synonyms;
-	QVariant m_defVal;
-};
diff --git a/libraries/logic/settings/SettingsObject.cpp b/libraries/logic/settings/SettingsObject.cpp
deleted file mode 100644
index f2ffdf9b..00000000
--- a/libraries/logic/settings/SettingsObject.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "settings/SettingsObject.h"
-#include "settings/Setting.h"
-#include "settings/OverrideSetting.h"
-#include "PassthroughSetting.h"
-#include <QDebug>
-
-#include <QVariant>
-
-SettingsObject::SettingsObject(QObject *parent) : QObject(parent)
-{
-}
-
-SettingsObject::~SettingsObject()
-{
-	m_settings.clear();
-}
-
-std::shared_ptr<Setting> SettingsObject::registerOverride(std::shared_ptr<Setting> original,
-														  std::shared_ptr<Setting> gate)
-{
-	if (contains(original->id()))
-	{
-		qCritical() << QString("Failed to register setting %1. ID already exists.")
-				   .arg(original->id());
-		return nullptr; // Fail
-	}
-	auto override = std::make_shared<OverrideSetting>(original, gate);
-	override->m_storage = this;
-	connectSignals(*override);
-	m_settings.insert(override->id(), override);
-	return override;
-}
-
-std::shared_ptr<Setting> SettingsObject::registerPassthrough(std::shared_ptr<Setting> original,
-															 std::shared_ptr<Setting> gate)
-{
-	if (contains(original->id()))
-	{
-		qCritical() << QString("Failed to register setting %1. ID already exists.")
-				   .arg(original->id());
-		return nullptr; // Fail
-	}
-	auto passthrough = std::make_shared<PassthroughSetting>(original, gate);
-	passthrough->m_storage = this;
-	connectSignals(*passthrough);
-	m_settings.insert(passthrough->id(), passthrough);
-	return passthrough;
-}
-
-std::shared_ptr<Setting> SettingsObject::registerSetting(QStringList synonyms, QVariant defVal)
-{
-	if (synonyms.empty())
-		return nullptr;
-	if (contains(synonyms.first()))
-	{
-		qCritical() << QString("Failed to register setting %1. ID already exists.")
-				   .arg(synonyms.first());
-		return nullptr; // Fail
-	}
-	auto setting = std::make_shared<Setting>(synonyms, defVal);
-	setting->m_storage = this;
-	connectSignals(*setting);
-	m_settings.insert(setting->id(), setting);
-	return setting;
-}
-
-std::shared_ptr<Setting> SettingsObject::getSetting(const QString &id) const
-{
-	// Make sure there is a setting with the given ID.
-	if (!m_settings.contains(id))
-		return NULL;
-
-	return m_settings[id];
-}
-
-QVariant SettingsObject::get(const QString &id) const
-{
-	auto setting = getSetting(id);
-	return (setting ? setting->get() : QVariant());
-}
-
-bool SettingsObject::set(const QString &id, QVariant value)
-{
-	auto setting = getSetting(id);
-	if (!setting)
-	{
-		qCritical() << QString("Error changing setting %1. Setting doesn't exist.").arg(id);
-		return false;
-	}
-	else
-	{
-		setting->set(value);
-		return true;
-	}
-}
-
-void SettingsObject::reset(const QString &id) const
-{
-	auto setting = getSetting(id);
-	if (setting)
-		setting->reset();
-}
-
-bool SettingsObject::contains(const QString &id)
-{
-	return m_settings.contains(id);
-}
-
-bool SettingsObject::reload()
-{
-	for (auto setting : m_settings.values())
-	{
-		setting->set(setting->get());
-	}
-	return true;
-}
-
-void SettingsObject::connectSignals(const Setting &setting)
-{
-	connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
-			SLOT(changeSetting(const Setting &, QVariant)));
-	connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
-			SIGNAL(SettingChanged(const Setting &, QVariant)));
-
-	connect(&setting, SIGNAL(settingReset(Setting)), SLOT(resetSetting(const Setting &)));
-	connect(&setting, SIGNAL(settingReset(Setting)), SIGNAL(settingReset(const Setting &)));
-}
diff --git a/libraries/logic/settings/SettingsObject.h b/libraries/logic/settings/SettingsObject.h
deleted file mode 100644
index 82193903..00000000
--- a/libraries/logic/settings/SettingsObject.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QMap>
-#include <QStringList>
-#include <QVariant>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class Setting;
-class SettingsObject;
-
-typedef std::shared_ptr<SettingsObject> SettingsObjectPtr;
-
-/*!
- * \brief The SettingsObject handles communicating settings between the application and a
- *settings file.
- * The class keeps a list of Setting objects. Each Setting object represents one
- * of the application's settings. These Setting objects are registered with
- * a SettingsObject and can be managed similarly to the way a list works.
- *
- * \author Andrew Okin
- * \date 2/22/2013
- *
- * \sa Setting
- */
-class MULTIMC_LOGIC_EXPORT SettingsObject : public QObject
-{
-	Q_OBJECT
-public:
-	class Lock
-	{
-	public:
-		Lock(SettingsObjectPtr locked)
-			:m_locked(locked)
-		{
-			m_locked->suspendSave();
-		}
-		~Lock()
-		{
-			m_locked->resumeSave();
-		}
-	private:
-		SettingsObjectPtr m_locked;
-	};
-public:
-	explicit SettingsObject(QObject *parent = 0);
-	virtual ~SettingsObject();
-	/*!
-	 * Registers an override setting for the given original setting in this settings object
-	 * gate decides if the passthrough (true) or the original (false) is used for value
-	 *
-	 * This will fail if there is already a setting with the same ID as
-	 * the one that is being registered.
-	 * \return A valid Setting shared pointer if successful.
-	 */
-	std::shared_ptr<Setting> registerOverride(std::shared_ptr<Setting> original, std::shared_ptr<Setting> gate);
-
-	/*!
-	 * Registers a passthorugh setting for the given original setting in this settings object
-	 * gate decides if the passthrough (true) or the original (false) is used for value
-	 *
-	 * This will fail if there is already a setting with the same ID as
-	 * the one that is being registered.
-	 * \return A valid Setting shared pointer if successful.
-	 */
-	std::shared_ptr<Setting> registerPassthrough(std::shared_ptr<Setting> original, std::shared_ptr<Setting> gate);
-
-	/*!
-	 * Registers the given setting with this SettingsObject and connects the necessary  signals.
-	 *
-	 * This will fail if there is already a setting with the same ID as
-	 * the one that is being registered.
-	 * \return A valid Setting shared pointer if successful.
-	 */
-	std::shared_ptr<Setting> registerSetting(QStringList synonyms,
-											 QVariant defVal = QVariant());
-
-	/*!
-	 * Registers the given setting with this SettingsObject and connects the necessary signals.
-	 *
-	 * This will fail if there is already a setting with the same ID as
-	 * the one that is being registered.
-	 * \return A valid Setting shared pointer if successful.
-	 */
-	std::shared_ptr<Setting> registerSetting(QString id, QVariant defVal = QVariant())
-	{
-		return registerSetting(QStringList(id), defVal);
-	}
-
-	/*!
-	 * \brief Gets the setting with the given ID.
-	 * \param id The ID of the setting to get.
-	 * \return A pointer to the setting with the given ID.
-	 * Returns null if there is no setting with the given ID.
-	 * \sa operator []()
-	 */
-	std::shared_ptr<Setting> getSetting(const QString &id) const;
-
-	/*!
-	 * \brief Gets the value of the setting with the given ID.
-	 * \param id The ID of the setting to get.
-	 * \return The setting's value as a QVariant.
-	 * If no setting with the given ID exists, returns an invalid QVariant.
-	 */
-	QVariant get(const QString &id) const;
-
-	/*!
-	 * \brief Sets the value of the setting with the given ID.
-	 * If no setting with the given ID exists, returns false
-	 * \param id The ID of the setting to change.
-	 * \param value The new value of the setting.
-	 * \return True if successful, false if it failed.
-	 */
-	bool set(const QString &id, QVariant value);
-
-	/*!
-	 * \brief Reverts the setting with the given ID to default.
-	 * \param id The ID of the setting to reset.
-	 */
-	void reset(const QString &id) const;
-
-	/*!
-	 * \brief Checks if this SettingsObject contains a setting with the given ID.
-	 * \param id The ID to check for.
-	 * \return True if the SettingsObject has a setting with the given ID.
-	 */
-	bool contains(const QString &id);
-
-	/*!
-	 * \brief Reloads the settings and emit signals for changed settings
-	 * \return True if reloading was successful
-	 */
-	virtual bool reload();
-
-	virtual void suspendSave() = 0;
-	virtual void resumeSave() = 0;
-signals:
-	/*!
-	 * \brief Signal emitted when one of this SettingsObject object's settings changes.
-	 * This is usually just connected directly to each Setting object's
-	 * SettingChanged() signals.
-	 * \param setting A reference to the Setting object that changed.
-	 * \param value The Setting object's new value.
-	 */
-	void SettingChanged(const Setting &setting, QVariant value);
-
-	/*!
-	 * \brief Signal emitted when one of this SettingsObject object's settings resets.
-	 * This is usually just connected directly to each Setting object's
-	 * settingReset() signals.
-	 * \param setting A reference to the Setting object that changed.
-	 */
-	void settingReset(const Setting &setting);
-
-protected
-slots:
-	/*!
-	 * \brief Changes a setting.
-	 * This slot is usually connected to each Setting object's
-	 * SettingChanged() signal. The signal is emitted, causing this slot
-	 * to update the setting's value in the config file.
-	 * \param setting A reference to the Setting object that changed.
-	 * \param value The setting's new value.
-	 */
-	virtual void changeSetting(const Setting &setting, QVariant value) = 0;
-
-	/*!
-	 * \brief Resets a setting.
-	 * This slot is usually connected to each Setting object's
-	 * settingReset() signal. The signal is emitted, causing this slot
-	 * to update the setting's value in the config file.
-	 * \param setting A reference to the Setting object that changed.
-	 */
-	virtual void resetSetting(const Setting &setting) = 0;
-
-protected:
-	/*!
-	 * \brief Connects the necessary signals to the given Setting.
-	 * \param setting The setting to connect.
-	 */
-	void connectSignals(const Setting &setting);
-
-	/*!
-	 * \brief Function used by Setting objects to get their values from the SettingsObject.
-	 * \param setting The
-	 * \return
-	 */
-	virtual QVariant retrieveValue(const Setting &setting) = 0;
-
-	friend class Setting;
-
-private:
-	QMap<QString, std::shared_ptr<Setting>> m_settings;
-protected:
-	bool m_suspendSave = false;
-	bool m_doSave = false;
-};
diff --git a/libraries/logic/status/StatusChecker.cpp b/libraries/logic/status/StatusChecker.cpp
deleted file mode 100644
index 13cac037..00000000
--- a/libraries/logic/status/StatusChecker.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "StatusChecker.h"
-
-#include <net/URLConstants.h>
-
-#include <QByteArray>
-
-#include <QDebug>
-
-StatusChecker::StatusChecker()
-{
-
-}
-
-void StatusChecker::timerEvent(QTimerEvent *e)
-{
-	QObject::timerEvent(e);
-	reloadStatus();
-}
-
-void StatusChecker::reloadStatus()
-{
-	if (isLoadingStatus())
-	{
-		// qDebug() << "Ignored request to reload status. Currently reloading already.";
-		return;
-	}
-
-	// qDebug() << "Reloading status.";
-
-	NetJob* job = new NetJob("Status JSON");
-	job->addNetAction(ByteArrayDownload::make(URLConstants::MOJANG_STATUS_URL));
-	QObject::connect(job, &NetJob::succeeded, this, &StatusChecker::statusDownloadFinished);
-	QObject::connect(job, &NetJob::failed, this, &StatusChecker::statusDownloadFailed);
-	m_statusNetJob.reset(job);
-	emit statusLoading(true);
-	job->start();
-}
-
-void StatusChecker::statusDownloadFinished()
-{
-	qDebug() << "Finished loading status JSON.";
-	m_statusEntries.clear();
-	QByteArray data;
-	{
-		ByteArrayDownloadPtr dl = std::dynamic_pointer_cast<ByteArrayDownload>(m_statusNetJob->first());
-		data = dl->m_data;
-		m_statusNetJob.reset();
-	}
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		fail("Error parsing status JSON:" + jsonError.errorString());
-		return;
-	}
-
-	if (!jsonDoc.isArray())
-	{
-		fail("Error parsing status JSON: JSON root is not an array");
-		return;
-	}
-
-	QJsonArray root = jsonDoc.array();
-
-	for(auto status = root.begin(); status != root.end(); ++status)
-	{
-		QVariantMap map = (*status).toObject().toVariantMap();
-
-		for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter)
-		{
-			QString key = iter.key();
-			QVariant value = iter.value();
-
-			if(value.type() == QVariant::Type::String)
-			{
-				m_statusEntries.insert(key, value.toString());
-				//qDebug() << "Status JSON object: " << key << m_statusEntries[key];
-			}
-			else
-			{
-				fail("Malformed status JSON: expected status type to be a string.");
-				return;
-			}
-		}
-	}
-
-	succeed();
-}
-
-void StatusChecker::statusDownloadFailed(QString reason)
-{
-	fail(tr("Failed to load status JSON:\n%1").arg(reason));
-}
-
-
-QMap<QString, QString> StatusChecker::getStatusEntries() const
-{
-	return m_statusEntries;
-}
-
-bool StatusChecker::isLoadingStatus() const
-{
-	return m_statusNetJob.get() != nullptr;
-}
-
-QString StatusChecker::getLastLoadErrorMsg() const
-{
-	return m_lastLoadError;
-}
-
-void StatusChecker::succeed()
-{
-	if(m_prevEntries != m_statusEntries)
-	{
-		emit statusChanged(m_statusEntries);
-		m_prevEntries = m_statusEntries;
-	}
-	m_lastLoadError = "";
-	qDebug() << "Status loading succeeded.";
-	m_statusNetJob.reset();
-	emit statusLoading(false);
-}
-
-void StatusChecker::fail(const QString& errorMsg)
-{
-	if(m_prevEntries != m_statusEntries)
-	{
-		emit statusChanged(m_statusEntries);
-		m_prevEntries = m_statusEntries;
-	}
-	m_lastLoadError = errorMsg;
-	qDebug() << "Failed to load status:" << errorMsg;
-	m_statusNetJob.reset();
-	emit statusLoading(false);
-}
-
diff --git a/libraries/logic/status/StatusChecker.h b/libraries/logic/status/StatusChecker.h
deleted file mode 100644
index c1a54dba..00000000
--- a/libraries/logic/status/StatusChecker.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <QList>
-
-#include <net/NetJob.h>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT StatusChecker : public QObject
-{
-	Q_OBJECT
-public:
-	StatusChecker();
-
-	QString getLastLoadErrorMsg() const;
-
-	bool isLoadingStatus() const;
-
-	QMap<QString, QString> getStatusEntries() const;
-
-	void Q_SLOT reloadStatus();
-
-protected:
-	virtual void timerEvent(QTimerEvent *);
-
-signals:
-	void statusLoading(bool loading);
-	void statusChanged(QMap<QString, QString> newStatus);
-
-protected slots:
-	void statusDownloadFinished();
-	void statusDownloadFailed(QString reason);
-
-protected:
-	QMap<QString, QString> m_prevEntries;
-	QMap<QString, QString> m_statusEntries;
-	NetJobPtr m_statusNetJob;
-	QString m_lastLoadError;
-
-	void Q_SLOT succeed();
-	void Q_SLOT fail(const QString& errorMsg);
-};
-
diff --git a/libraries/logic/tasks/SequentialTask.cpp b/libraries/logic/tasks/SequentialTask.cpp
deleted file mode 100644
index ac0e7820..00000000
--- a/libraries/logic/tasks/SequentialTask.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "SequentialTask.h"
-
-SequentialTask::SequentialTask(QObject *parent) : Task(parent), m_currentIndex(-1)
-{
-}
-
-void SequentialTask::addTask(std::shared_ptr<Task> task)
-{
-	m_queue.append(task);
-}
-
-void SequentialTask::executeTask()
-{
-	m_currentIndex = -1;
-	startNext();
-}
-
-void SequentialTask::startNext()
-{
-	if (m_currentIndex != -1)
-	{
-		std::shared_ptr<Task> previous = m_queue[m_currentIndex];
-		disconnect(previous.get(), 0, this, 0);
-	}
-	m_currentIndex++;
-	if (m_queue.isEmpty() || m_currentIndex >= m_queue.size())
-	{
-		emitSucceeded();
-		return;
-	}
-	std::shared_ptr<Task> next = m_queue[m_currentIndex];
-	connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
-	connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
-	connect(next.get(), SIGNAL(progress(qint64, qint64)), this, SLOT(subTaskProgress(qint64, qint64)));
-	connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
-	next->start();
-}
-
-void SequentialTask::subTaskFailed(const QString &msg)
-{
-	emitFailed(msg);
-}
-void SequentialTask::subTaskStatus(const QString &msg)
-{
-	setStatus(msg);
-}
-void SequentialTask::subTaskProgress(qint64 current, qint64 total)
-{
-	if(total == 0)
-	{
-		setProgress(0, 100);
-		return;
-	}
-	setProgress(current, total);
-}
diff --git a/libraries/logic/tasks/SequentialTask.h b/libraries/logic/tasks/SequentialTask.h
deleted file mode 100644
index 69031095..00000000
--- a/libraries/logic/tasks/SequentialTask.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "Task.h"
-
-#include <QQueue>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT SequentialTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit SequentialTask(QObject *parent = 0);
-
-	void addTask(std::shared_ptr<Task> task);
-
-protected:
-	void executeTask();
-
-private
-slots:
-	void startNext();
-	void subTaskFailed(const QString &msg);
-	void subTaskStatus(const QString &msg);
-	void subTaskProgress(qint64 current, qint64 total);
-
-private:
-	QQueue<std::shared_ptr<Task> > m_queue;
-	int m_currentIndex;
-};
diff --git a/libraries/logic/tasks/Task.cpp b/libraries/logic/tasks/Task.cpp
deleted file mode 100644
index 3c4e3188..00000000
--- a/libraries/logic/tasks/Task.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Task.h"
-
-#include <QDebug>
-
-Task::Task(QObject *parent) : QObject(parent)
-{
-}
-
-void Task::setStatus(const QString &new_status)
-{
-	if(m_status != new_status)
-	{
-		m_status = new_status;
-		emit status(m_status);
-	}
-}
-
-void Task::setProgress(qint64 current, qint64 total)
-{
-	m_progress = current;
-	m_progressTotal = total;
-	emit progress(m_progress, m_progressTotal);
-}
-
-void Task::start()
-{
-	m_running = true;
-	emit started();
-	executeTask();
-}
-
-void Task::emitFailed(QString reason)
-{
-	m_running = false;
-	m_finished = true;
-	m_succeeded = false;
-	m_failReason = reason;
-	qCritical() << "Task failed: " << reason;
-	emit failed(reason);
-	emit finished();
-}
-
-void Task::emitSucceeded()
-{
-	if (!m_running) { return; } // Don't succeed twice.
-	m_running = false;
-	m_finished = true;
-	m_succeeded = true;
-	qDebug() << "Task succeeded";
-	emit succeeded();
-	emit finished();
-}
-
-bool Task::isRunning() const
-{
-	return m_running;
-}
-
-bool Task::isFinished() const
-{
-	return m_finished;
-}
-
-bool Task::successful() const
-{
-	return m_succeeded;
-}
-
-QString Task::failReason() const
-{
-	return m_failReason;
-}
-
diff --git a/libraries/logic/tasks/Task.h b/libraries/logic/tasks/Task.h
deleted file mode 100644
index 2b0ccbcd..00000000
--- a/libraries/logic/tasks/Task.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <QString>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT Task : public QObject
-{
-	Q_OBJECT
-public:
-	explicit Task(QObject *parent = 0);
-	virtual ~Task() {};
-
-	virtual bool isRunning() const;
-
-	virtual bool isFinished() const;
-
-	/*!
-	 * True if this task was successful.
-	 * If the task failed or is still running, returns false.
-	 */
-	virtual bool successful() const;
-
-	/*!
-	 * Returns the string that was passed to emitFailed as the error message when the task failed.
-	 * If the task hasn't failed, returns an empty string.
-	 */
-	virtual QString failReason() const;
-
-	virtual bool canAbort() const { return false; }
-
-	QString getStatus()
-	{
-		return m_status;
-	}
-
-	qint64 getProgress()
-	{
-		return m_progress;
-	}
-
-	qint64 getTotalProgress()
-	{
-		return m_progressTotal;
-	}
-
-signals:
-	void started();
-	void progress(qint64 current, qint64 total);
-	void finished();
-	void succeeded();
-	void failed(QString reason);
-	void status(QString status);
-
-public
-slots:
-	virtual void start();
-	virtual bool abort() { return false; };
-
-protected:
-	virtual void executeTask() = 0;
-
-protected slots:
-	virtual void emitSucceeded();
-	virtual void emitFailed(QString reason);
-
-public slots:
-	void setStatus(const QString &status);
-	void setProgress(qint64 current, qint64 total);
-
-protected:
-	bool m_running = false;
-	bool m_finished = false;
-	bool m_succeeded = false;
-	QString m_failReason = "";
-	QString m_status;
-	int m_progress = 0;
-	int m_progressTotal = 100;
-};
-
diff --git a/libraries/logic/tasks/ThreadTask.cpp b/libraries/logic/tasks/ThreadTask.cpp
deleted file mode 100644
index ddd1dee5..00000000
--- a/libraries/logic/tasks/ThreadTask.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "ThreadTask.h"
-#include <QtConcurrentRun>
-ThreadTask::ThreadTask(Task * internal, QObject *parent) : Task(parent), m_internal(internal)
-{
-}
-
-void ThreadTask::start()
-{
-	connect(m_internal, SIGNAL(failed(QString)), SLOT(iternal_failed(QString)));
-	connect(m_internal, SIGNAL(progress(qint64,qint64)), SLOT(iternal_progress(qint64,qint64)));
-	connect(m_internal, SIGNAL(started()), SLOT(iternal_started()));
-	connect(m_internal, SIGNAL(status(QString)), SLOT(iternal_status(QString)));
-	connect(m_internal, SIGNAL(succeeded()), SLOT(iternal_succeeded()));
-	m_running = true;
-	QtConcurrent::run(m_internal, &Task::start);
-}
-
-void ThreadTask::iternal_failed(QString reason)
-{
-	emitFailed(reason);
-}
-
-void ThreadTask::iternal_progress(qint64 current, qint64 total)
-{
-	progress(current, total);
-}
-
-void ThreadTask::iternal_started()
-{
-	emit started();
-}
-
-void ThreadTask::iternal_status(QString status)
-{
-	setStatus(status);
-}
-
-void ThreadTask::iternal_succeeded()
-{
-	emitSucceeded();
-}
diff --git a/libraries/logic/tasks/ThreadTask.h b/libraries/logic/tasks/ThreadTask.h
deleted file mode 100644
index 718dbc91..00000000
--- a/libraries/logic/tasks/ThreadTask.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Task.h"
-
-class ThreadTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit ThreadTask(Task * internal, QObject * parent = nullptr);
-
-protected:
-	void executeTask() {};
-
-public slots:
-	virtual void start();
-
-private slots:
-	void iternal_started();
-	void iternal_progress(qint64 current, qint64 total);
-	void iternal_succeeded();
-	void iternal_failed(QString reason);
-	void iternal_status(QString status);
-private:
-	Task * m_internal;
-};
\ No newline at end of file
diff --git a/libraries/logic/tools/BaseExternalTool.cpp b/libraries/logic/tools/BaseExternalTool.cpp
deleted file mode 100644
index 2b97c3c9..00000000
--- a/libraries/logic/tools/BaseExternalTool.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "BaseExternalTool.h"
-
-#include <QProcess>
-#include <QDir>
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
-#include "BaseInstance.h"
-
-BaseExternalTool::BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-	: QObject(parent), m_instance(instance), globalSettings(settings)
-{
-}
-
-BaseExternalTool::~BaseExternalTool()
-{
-}
-
-BaseDetachedTool::BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-	: BaseExternalTool(settings, instance, parent)
-{
-
-}
-
-void BaseDetachedTool::run()
-{
-	runImpl();
-}
-
-
-BaseExternalToolFactory::~BaseExternalToolFactory()
-{
-}
-
-BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(InstancePtr instance,
-															  QObject *parent)
-{
-	return qobject_cast<BaseDetachedTool *>(createTool(instance, parent));
-}
diff --git a/libraries/logic/tools/BaseExternalTool.h b/libraries/logic/tools/BaseExternalTool.h
deleted file mode 100644
index fe1b5dc6..00000000
--- a/libraries/logic/tools/BaseExternalTool.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <BaseInstance.h>
-
-#include "multimc_logic_export.h"
-
-class BaseInstance;
-class SettingsObject;
-class QProcess;
-
-class MULTIMC_LOGIC_EXPORT BaseExternalTool : public QObject
-{
-	Q_OBJECT
-public:
-	explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-	virtual ~BaseExternalTool();
-
-protected:
-	InstancePtr m_instance;
-	SettingsObjectPtr globalSettings;
-};
-
-class MULTIMC_LOGIC_EXPORT BaseDetachedTool : public BaseExternalTool
-{
-	Q_OBJECT
-public:
-	explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-
-public
-slots:
-	void run();
-
-protected:
-	virtual void runImpl() = 0;
-};
-
-class MULTIMC_LOGIC_EXPORT BaseExternalToolFactory
-{
-public:
-	virtual ~BaseExternalToolFactory();
-
-	virtual QString name() const = 0;
-
-	virtual void registerSettings(SettingsObjectPtr settings) = 0;
-
-	virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0;
-
-	virtual bool check(QString *error) = 0;
-	virtual bool check(const QString &path, QString *error) = 0;
-
-protected:
-	SettingsObjectPtr globalSettings;
-};
-
-class MULTIMC_LOGIC_EXPORT BaseDetachedToolFactory : public BaseExternalToolFactory
-{
-public:
-	virtual BaseDetachedTool *createDetachedTool(InstancePtr instance, QObject *parent = 0);
-};
diff --git a/libraries/logic/tools/BaseProfiler.cpp b/libraries/logic/tools/BaseProfiler.cpp
deleted file mode 100644
index 5ff0fa44..00000000
--- a/libraries/logic/tools/BaseProfiler.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "BaseProfiler.h"
-
-#include <QProcess>
-
-BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-	: BaseExternalTool(settings, instance, parent)
-{
-}
-
-void BaseProfiler::beginProfiling(std::shared_ptr<LaunchTask> process)
-{
-	beginProfilingImpl(process);
-}
-
-void BaseProfiler::abortProfiling()
-{
-	abortProfilingImpl();
-}
-
-void BaseProfiler::abortProfilingImpl()
-{
-	if (!m_profilerProcess)
-	{
-		return;
-	}
-	m_profilerProcess->terminate();
-	m_profilerProcess->deleteLater();
-	m_profilerProcess = 0;
-	emit abortLaunch(tr("Profiler aborted"));
-}
-
-BaseProfiler *BaseProfilerFactory::createProfiler(InstancePtr instance, QObject *parent)
-{
-	return qobject_cast<BaseProfiler *>(createTool(instance, parent));
-}
diff --git a/libraries/logic/tools/BaseProfiler.h b/libraries/logic/tools/BaseProfiler.h
deleted file mode 100644
index 3340b7e4..00000000
--- a/libraries/logic/tools/BaseProfiler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "BaseExternalTool.h"
-
-#include "multimc_logic_export.h"
-
-class BaseInstance;
-class SettingsObject;
-class LaunchTask;
-class QProcess;
-
-class MULTIMC_LOGIC_EXPORT BaseProfiler : public BaseExternalTool
-{
-	Q_OBJECT
-public:
-	explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-
-public
-slots:
-	void beginProfiling(std::shared_ptr<LaunchTask> process);
-	void abortProfiling();
-
-protected:
-	QProcess *m_profilerProcess;
-
-	virtual void beginProfilingImpl(std::shared_ptr<LaunchTask> process) = 0;
-	virtual void abortProfilingImpl();
-
-signals:
-	void readyToLaunch(const QString &message);
-	void abortLaunch(const QString &message);
-};
-
-class MULTIMC_LOGIC_EXPORT BaseProfilerFactory : public BaseExternalToolFactory
-{
-public:
-	virtual BaseProfiler *createProfiler(InstancePtr instance, QObject *parent = 0);
-};
diff --git a/libraries/logic/tools/JProfiler.cpp b/libraries/logic/tools/JProfiler.cpp
deleted file mode 100644
index a0e3c895..00000000
--- a/libraries/logic/tools/JProfiler.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "JProfiler.h"
-
-#include <QDir>
-
-#include "settings/SettingsObject.h"
-#include "launch/LaunchTask.h"
-#include "BaseInstance.h"
-
-class JProfiler : public BaseProfiler
-{
-	Q_OBJECT
-public:
-	JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-
-private slots:
-	void profilerStarted();
-	void profilerFinished(int exit, QProcess::ExitStatus status);
-
-protected:
-	void beginProfilingImpl(std::shared_ptr<LaunchTask> process);
-
-private:
-	int listeningPort = 0;
-};
-
-JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance,
-					 QObject *parent)
-	: BaseProfiler(settings, instance, parent)
-{
-}
-
-void JProfiler::profilerStarted()
-{
-	emit readyToLaunch(tr("Listening on port: %1").arg(listeningPort));
-}
-
-void JProfiler::profilerFinished(int exit, QProcess::ExitStatus status)
-{
-	if (status == QProcess::CrashExit)
-	{
-		emit abortLaunch(tr("Profiler aborted"));
-	}
-	if (m_profilerProcess)
-	{
-		m_profilerProcess->deleteLater();
-		m_profilerProcess = 0;
-	}
-}
-
-void JProfiler::beginProfilingImpl(std::shared_ptr<LaunchTask> process)
-{
-	listeningPort = globalSettings->get("JProfilerPort").toInt();
-	QProcess *profiler = new QProcess(this);
-	QStringList profilerArgs =
-	{
-		"-d", QString::number(process->pid()),
-		"--gui",
-		"-p", QString::number(listeningPort)
-	};
-	auto basePath = globalSettings->get("JProfilerPath").toString();
-
-#ifdef Q_OS_WIN
-	QString profilerProgram = QDir(basePath).absoluteFilePath("bin/jpenable.exe");
-#else
-	QString profilerProgram = QDir(basePath).absoluteFilePath("bin/jpenable");
-#endif
-
-	profiler->setArguments(profilerArgs);
-	profiler->setProgram(profilerProgram);
-
-	connect(profiler, SIGNAL(started()), SLOT(profilerStarted()));
-	connect(profiler, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(profilerFinished(int,QProcess::ExitStatus)));
-
-	m_profilerProcess = profiler;
-	profiler->start();
-}
-
-void JProfilerFactory::registerSettings(SettingsObjectPtr settings)
-{
-	settings->registerSetting("JProfilerPath");
-	settings->registerSetting("JProfilerPort", 42042);
-	globalSettings = settings;
-}
-
-BaseExternalTool *JProfilerFactory::createTool(InstancePtr instance, QObject *parent)
-{
-	return new JProfiler(globalSettings, instance, parent);
-}
-
-bool JProfilerFactory::check(QString *error)
-{
-	return check(globalSettings->get("JProfilerPath").toString(), error);
-}
-
-bool JProfilerFactory::check(const QString &path, QString *error)
-{
-	if (path.isEmpty())
-	{
-		*error = QObject::tr("Empty path");
-		return false;
-	}
-	QDir dir(path);
-	if (!dir.exists())
-	{
-		*error = QObject::tr("Path does not exist");
-		return false;
-	}
-	if (!dir.exists("bin") || !(dir.exists("bin/jprofiler") || dir.exists("bin/jprofiler.exe")) || !dir.exists("bin/agent.jar"))
-	{
-		*error = QObject::tr("Invalid JProfiler install");
-		return false;
-	}
-	return true;
-}
-
-#include "JProfiler.moc"
diff --git a/libraries/logic/tools/JProfiler.h b/libraries/logic/tools/JProfiler.h
deleted file mode 100644
index d658d6c2..00000000
--- a/libraries/logic/tools/JProfiler.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "BaseProfiler.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT JProfilerFactory : public BaseProfilerFactory
-{
-public:
-	QString name() const override { return "JProfiler"; }
-	void registerSettings(SettingsObjectPtr settings) override;
-	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
-	bool check(QString *error) override;
-	bool check(const QString &path, QString *error) override;
-};
diff --git a/libraries/logic/tools/JVisualVM.cpp b/libraries/logic/tools/JVisualVM.cpp
deleted file mode 100644
index 169967d9..00000000
--- a/libraries/logic/tools/JVisualVM.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "JVisualVM.h"
-
-#include <QDir>
-#include <QStandardPaths>
-
-#include "settings/SettingsObject.h"
-#include "launch/LaunchTask.h"
-#include "BaseInstance.h"
-
-class JVisualVM : public BaseProfiler
-{
-	Q_OBJECT
-public:
-	JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-
-private slots:
-	void profilerStarted();
-	void profilerFinished(int exit, QProcess::ExitStatus status);
-
-protected:
-	void beginProfilingImpl(std::shared_ptr<LaunchTask> process);
-};
-
-
-JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-	: BaseProfiler(settings, instance, parent)
-{
-}
-
-void JVisualVM::profilerStarted()
-{
-	emit readyToLaunch(tr("JVisualVM started"));
-}
-
-void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
-{
-	if (status == QProcess::CrashExit)
-	{
-		emit abortLaunch(tr("Profiler aborted"));
-	}
-	if (m_profilerProcess)
-	{
-		m_profilerProcess->deleteLater();
-		m_profilerProcess = 0;
-	}
-}
-
-void JVisualVM::beginProfilingImpl(std::shared_ptr<LaunchTask> process)
-{
-	QProcess *profiler = new QProcess(this);
-	QStringList profilerArgs =
-	{
-		"--openpid", QString::number(process->pid())
-	};
-	auto programPath = globalSettings->get("JVisualVMPath").toString();
-
-	profiler->setArguments(profilerArgs);
-	profiler->setProgram(programPath);
-
-	connect(profiler, SIGNAL(started()), SLOT(profilerStarted()));
-	connect(profiler, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(profilerFinished(int,QProcess::ExitStatus)));
-
-	profiler->start();
-	m_profilerProcess = profiler;
-}
-
-void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
-{
-	QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
-	if (defaultValue.isNull())
-	{
-		defaultValue = QStandardPaths::findExecutable("visualvm");
-	}
-	settings->registerSetting("JVisualVMPath", defaultValue);
-	globalSettings = settings;
-}
-
-BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent)
-{
-	return new JVisualVM(globalSettings, instance, parent);
-}
-
-bool JVisualVMFactory::check(QString *error)
-{
-	return check(globalSettings->get("JVisualVMPath").toString(), error);
-}
-
-bool JVisualVMFactory::check(const QString &path, QString *error)
-{
-	if (path.isEmpty())
-	{
-		*error = QObject::tr("Empty path");
-		return false;
-	}
-	if (!QDir::isAbsolutePath(path) || !QFileInfo(path).isExecutable() || !path.contains("visualvm"))
-	{
-		*error = QObject::tr("Invalid path to JVisualVM");
-		return false;
-	}
-	return true;
-}
-
-#include "JVisualVM.moc"
diff --git a/libraries/logic/tools/JVisualVM.h b/libraries/logic/tools/JVisualVM.h
deleted file mode 100644
index 0674da13..00000000
--- a/libraries/logic/tools/JVisualVM.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "BaseProfiler.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT JVisualVMFactory : public BaseProfilerFactory
-{
-public:
-	QString name() const override { return "JVisualVM"; }
-	void registerSettings(SettingsObjectPtr settings) override;
-	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
-	bool check(QString *error) override;
-	bool check(const QString &path, QString *error) override;
-};
diff --git a/libraries/logic/tools/MCEditTool.cpp b/libraries/logic/tools/MCEditTool.cpp
deleted file mode 100644
index 32695c8d..00000000
--- a/libraries/logic/tools/MCEditTool.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include "MCEditTool.h"
-
-#include <QDir>
-#include <QProcess>
-#include <QUrl>
-
-#include "settings/SettingsObject.h"
-#include "BaseInstance.h"
-#include "minecraft/MinecraftInstance.h"
-
-MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-	: BaseDetachedTool(settings, instance, parent)
-{
-}
-
-QString MCEditTool::getSave() const
-{
-	// FIXME: mixing logic and UI!!!!
-	auto mcInstance = std::dynamic_pointer_cast<MinecraftInstance>(m_instance);
-	if(!mcInstance)
-	{
-		return QString();
-	}
-	QDir saves(mcInstance->minecraftRoot() + "/saves");
-	QStringList worlds = saves.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-	QMutableListIterator<QString> it(worlds);
-	while (it.hasNext())
-	{
-		it.next();
-		if (!QDir(saves.absoluteFilePath(it.value())).exists("level.dat"))
-		{
-			it.remove();
-		}
-	}
-	bool ok = true;
-	/*
-	const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"),
-		worlds, 0, false, &ok);
-	if (ok)
-	{
-		return saves.absoluteFilePath(save);
-	}
-	*/
-	return QString();
-}
-
-void MCEditTool::runImpl()
-{
-	const QString mceditPath = globalSettings->get("MCEditPath").toString();
-	const QString save = getSave();
-	if (save.isNull())
-	{
-		return;
-	}
-#ifdef Q_OS_OSX
-	QProcess *process = new QProcess();
-	connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), process, SLOT(deleteLater()));
-	process->setProgram(mceditPath);
-	process->setArguments(QStringList() << save);
-	process->start();
-#else
-	QDir mceditDir(mceditPath);
-	QString program;
-	#ifdef Q_OS_LINUX
-	if (mceditDir.exists("mcedit.py"))
-	{
-		program = mceditDir.absoluteFilePath("mcedit.py");
-	}
-	else if (mceditDir.exists("mcedit.sh"))
-	{
-		program = mceditDir.absoluteFilePath("mcedit.sh");
-	}
-	#elif defined(Q_OS_WIN32)
-	if (mceditDir.exists("mcedit.exe"))
-	{
-		program = mceditDir.absoluteFilePath("mcedit.exe");
-	}
-	else if (mceditDir.exists("mcedit2.exe"))
-	{
-		program = mceditDir.absoluteFilePath("mcedit2.exe");
-	}
-	#endif
-	/*
-	if(program.size())
-	{
-		DesktopServices::openFile(program, save, mceditPath);
-	}
-	*/
-#endif
-}
-
-void MCEditFactory::registerSettings(SettingsObjectPtr settings)
-{
-	settings->registerSetting("MCEditPath");
-	globalSettings = settings;
-}
-BaseExternalTool *MCEditFactory::createTool(InstancePtr instance, QObject *parent)
-{
-	return new MCEditTool(globalSettings, instance, parent);
-}
-bool MCEditFactory::check(QString *error)
-{
-	return check(globalSettings->get("MCEditPath").toString(), error);
-}
-bool MCEditFactory::check(const QString &path, QString *error)
-{
-	if (path.isEmpty())
-	{
-		*error = QObject::tr("Path is empty");
-		return false;
-	}
-	const QDir dir(path);
-	if (!dir.exists())
-	{
-		*error = QObject::tr("Path does not exist");
-		return false;
-	}
-	if (!dir.exists("mcedit.sh") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") && !dir.exists("mcedit2.exe"))
-	{
-		*error = QObject::tr("Path does not seem to be a MCEdit path");
-		return false;
-	}
-	return true;
-}
diff --git a/libraries/logic/tools/MCEditTool.h b/libraries/logic/tools/MCEditTool.h
deleted file mode 100644
index c287f1ea..00000000
--- a/libraries/logic/tools/MCEditTool.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "BaseExternalTool.h"
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT MCEditTool : public BaseDetachedTool
-{
-	Q_OBJECT
-public:
-	explicit MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
-
-protected:
-	QString getSave() const;
-	void runImpl() override;
-};
-
-class MULTIMC_LOGIC_EXPORT MCEditFactory : public BaseDetachedToolFactory
-{
-public:
-	QString name() const override { return "MCEdit"; }
-	void registerSettings(SettingsObjectPtr settings) override;
-	BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
-	bool check(QString *error) override;
-	bool check(const QString &path, QString *error) override;
-};
diff --git a/libraries/logic/trans/TranslationDownloader.cpp b/libraries/logic/trans/TranslationDownloader.cpp
deleted file mode 100644
index ee5c1fd2..00000000
--- a/libraries/logic/trans/TranslationDownloader.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "TranslationDownloader.h"
-#include "net/NetJob.h"
-#include "net/CacheDownload.h"
-#include "net/URLConstants.h"
-#include "Env.h"
-#include <QDebug>
-
-TranslationDownloader::TranslationDownloader()
-{
-}
-void TranslationDownloader::downloadTranslations()
-{
-	qDebug() << "Downloading Translations Index...";
-	m_index_job.reset(new NetJob("Translations Index"));
-	m_index_task = ByteArrayDownload::make(QUrl("http://files.multimc.org/translations/index"));
-	m_index_job->addNetAction(m_index_task);
-	connect(m_index_job.get(), &NetJob::failed, this, &TranslationDownloader::indexFailed);
-	connect(m_index_job.get(), &NetJob::succeeded, this, &TranslationDownloader::indexRecieved);
-	m_index_job->start();
-}
-void TranslationDownloader::indexRecieved()
-{
-	qDebug() << "Got translations index!";
-	m_dl_job.reset(new NetJob("Translations"));
-	QList<QByteArray> lines = m_index_task->m_data.split('\n');
-	for (const auto line : lines)
-	{
-		if (!line.isEmpty())
-		{
-			MetaEntryPtr entry = ENV.metacache()->resolveEntry("translations", "mmc_" + line);
-			entry->setStale(true);
-			CacheDownloadPtr dl = CacheDownload::make(
-				QUrl(URLConstants::TRANSLATIONS_BASE_URL + line),
-				entry);
-			m_dl_job->addNetAction(dl);
-		}
-	}
-	connect(m_dl_job.get(), &NetJob::succeeded, this, &TranslationDownloader::dlGood);
-	connect(m_dl_job.get(), &NetJob::failed, this, &TranslationDownloader::dlFailed);
-	m_dl_job->start();
-}
-void TranslationDownloader::dlFailed(QString reason)
-{
-	qCritical() << "Translations Download Failed:" << reason;
-}
-void TranslationDownloader::dlGood()
-{
-	qDebug() << "Got translations!";
-}
-void TranslationDownloader::indexFailed(QString reason)
-{
-	qCritical() << "Translations Index Download Failed:" << reason;
-}
diff --git a/libraries/logic/trans/TranslationDownloader.h b/libraries/logic/trans/TranslationDownloader.h
deleted file mode 100644
index e7893805..00000000
--- a/libraries/logic/trans/TranslationDownloader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <QList>
-#include <QUrl>
-#include <memory>
-#include <QObject>
-#include <net/NetJob.h>
-#include "multimc_logic_export.h"
-
-class ByteArrayDownload;
-class NetJob;
-
-class MULTIMC_LOGIC_EXPORT TranslationDownloader : public QObject
-{
-	Q_OBJECT
-
-public:
-	TranslationDownloader();
-
-	void downloadTranslations();
-
-private slots:
-	void indexRecieved();
-	void indexFailed(QString reason);
-	void dlFailed(QString reason);
-	void dlGood();
-
-private:
-	std::shared_ptr<ByteArrayDownload> m_index_task;
-	NetJobPtr m_dl_job;
-	NetJobPtr m_index_job;
-};
diff --git a/libraries/logic/updater/DownloadTask.cpp b/libraries/logic/updater/DownloadTask.cpp
deleted file mode 100644
index 6947e8bf..00000000
--- a/libraries/logic/updater/DownloadTask.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Copyright 2013-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "DownloadTask.h"
-
-#include "updater/UpdateChecker.h"
-#include "GoUpdate.h"
-#include "net/NetJob.h"
-
-#include <QFile>
-#include <QTemporaryDir>
-#include <QCryptographicHash>
-
-namespace GoUpdate
-{
-
-DownloadTask::DownloadTask(Status status, QString target, QObject *parent)
-	: Task(parent), m_updateFilesDir(target)
-{
-	m_status = status;
-
-	m_updateFilesDir.setAutoRemove(false);
-}
-
-void DownloadTask::executeTask()
-{
-	loadVersionInfo();
-}
-
-void DownloadTask::loadVersionInfo()
-{
-	setStatus(tr("Loading version information..."));
-
-	m_currentVersionFileListDownload.reset();
-	m_newVersionFileListDownload.reset();
-
-	NetJob *netJob = new NetJob("Version Info");
-
-	// Find the index URL.
-	QUrl newIndexUrl = QUrl(m_status.newRepoUrl).resolved(QString::number(m_status.newVersionId) + ".json");
-	qDebug() << m_status.newRepoUrl << " turns into " << newIndexUrl;
-
-	netJob->addNetAction(m_newVersionFileListDownload = ByteArrayDownload::make(newIndexUrl));
-
-	// If we have a current version URL, get that one too.
-	if (!m_status.currentRepoUrl.isEmpty())
-	{
-		QUrl cIndexUrl = QUrl(m_status.currentRepoUrl).resolved(QString::number(m_status.currentVersionId) + ".json");
-		netJob->addNetAction(m_currentVersionFileListDownload = ByteArrayDownload::make(cIndexUrl));
-		qDebug() << m_status.currentRepoUrl << " turns into " << cIndexUrl;
-	}
-
-	// connect signals and start the job
-	connect(netJob, &NetJob::succeeded, this, &DownloadTask::processDownloadedVersionInfo);
-	connect(netJob, &NetJob::failed, this, &DownloadTask::vinfoDownloadFailed);
-	m_vinfoNetJob.reset(netJob);
-	netJob->start();
-}
-
-void DownloadTask::vinfoDownloadFailed()
-{
-	// Something failed. We really need the second download (current version info), so parse
-	// downloads anyways as long as the first one succeeded.
-	if (m_newVersionFileListDownload->m_status != Job_Failed)
-	{
-		processDownloadedVersionInfo();
-		return;
-	}
-
-	// TODO: Give a more detailed error message.
-	qCritical() << "Failed to download version info files.";
-	emitFailed(tr("Failed to download version info files."));
-}
-
-void DownloadTask::processDownloadedVersionInfo()
-{
-	VersionFileList m_currentVersionFileList;
-	VersionFileList m_newVersionFileList;
-
-	setStatus(tr("Reading file list for new version..."));
-	qDebug() << "Reading file list for new version...";
-	QString error;
-	if (!parseVersionInfo(m_newVersionFileListDownload->m_data, m_newVersionFileList, error))
-	{
-		qCritical() << error;
-		emitFailed(error);
-		return;
-	}
-
-	// if we have the current version info, use it.
-	if (m_currentVersionFileListDownload && m_currentVersionFileListDownload->m_status != Job_Failed)
-	{
-		setStatus(tr("Reading file list for current version..."));
-		qDebug() << "Reading file list for current version...";
-		// if this fails, it's not a complete loss.
-		QString error;
-		if(!parseVersionInfo( m_currentVersionFileListDownload->m_data, m_currentVersionFileList, error))
-		{
-			qDebug() << error << "This is not a fatal error.";
-		}
-	}
-
-	// We don't need this any more.
-	m_currentVersionFileListDownload.reset();
-	m_newVersionFileListDownload.reset();
-	m_vinfoNetJob.reset();
-
-	setStatus(tr("Processing file lists - figuring out how to install the update..."));
-
-	// make a new netjob for the actual update files
-	NetJobPtr netJob (new NetJob("Update Files"));
-
-	// fill netJob and operationList
-	if (!processFileLists(m_currentVersionFileList, m_newVersionFileList, m_status.rootPath, m_updateFilesDir.path(), netJob, m_operations))
-	{
-		emitFailed(tr("Failed to process update lists..."));
-		return;
-	}
-
-	// Now start the download.
-	QObject::connect(netJob.get(), &NetJob::succeeded, this, &DownloadTask::fileDownloadFinished);
-	QObject::connect(netJob.get(), &NetJob::progress, this, &DownloadTask::fileDownloadProgressChanged);
-	QObject::connect(netJob.get(), &NetJob::failed, this, &DownloadTask::fileDownloadFailed);
-
-	setStatus(tr("Downloading %1 update files.").arg(QString::number(netJob->size())));
-	qDebug() << "Begin downloading update files to" << m_updateFilesDir.path();
-	m_filesNetJob = netJob;
-	m_filesNetJob->start();
-}
-
-void DownloadTask::fileDownloadFinished()
-{
-	emitSucceeded();
-}
-
-void DownloadTask::fileDownloadFailed(QString reason)
-{
-	qCritical() << "Failed to download update files:" << reason;
-	emitFailed(tr("Failed to download update files: %1").arg(reason));
-}
-
-void DownloadTask::fileDownloadProgressChanged(qint64 current, qint64 total)
-{
-	setProgress(current, total);
-}
-
-QString DownloadTask::updateFilesDir()
-{
-	return m_updateFilesDir.path();
-}
-
-OperationList DownloadTask::operations()
-{
-	return m_operations;
-}
-
-}
\ No newline at end of file
diff --git a/libraries/logic/updater/DownloadTask.h b/libraries/logic/updater/DownloadTask.h
deleted file mode 100644
index 83b4a142..00000000
--- a/libraries/logic/updater/DownloadTask.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2013-2014 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "tasks/Task.h"
-#include "net/NetJob.h"
-#include "GoUpdate.h"
-
-#include "multimc_logic_export.h"
-
-namespace GoUpdate
-{
-/*!
- * The DownloadTask is a task that takes a given version ID and repository URL,
- * downloads that version's files from the repository, and prepares to install them.
- */
-class MULTIMC_LOGIC_EXPORT DownloadTask : public Task
-{
-	Q_OBJECT
-
-public:
-	/**
-	 * Create a download task
-	 *
-	 * target is a template - XXXXXX at the end will be replaced with a random generated string, ensuring uniqueness
-	 */
-	explicit DownloadTask(Status status, QString target, QObject* parent = 0);
-
-	/// Get the directory that will contain the update files.
-	QString updateFilesDir();
-
-	/// Get the list of operations that should be done
-	OperationList operations();
-
-	/// set updater download behavior
-	void setUseLocalUpdater(bool useLocal);
-
-protected:
-	//! Entry point for tasks.
-	virtual void executeTask() override;
-
-	/*!
-	 * Downloads the version info files from the repository.
-	 * The files for both the current build, and the build that we're updating to need to be downloaded.
-	 * If the current version's info file can't be found, MultiMC will not delete files that
-	 * were removed between versions. It will still replace files that have changed, however.
-	 * Note that although the repository URL for the current version is not given to the update task,
-	 * the task will attempt to look it up in the UpdateChecker's channel list.
-	 * If an error occurs here, the function will call emitFailed and return false.
-	 */
-	void loadVersionInfo();
-
-	NetJobPtr m_vinfoNetJob;
-	ByteArrayDownloadPtr m_currentVersionFileListDownload;
-	ByteArrayDownloadPtr m_newVersionFileListDownload;
-
-	NetJobPtr m_filesNetJob;
-
-	Status m_status;
-
-	OperationList m_operations;
-
-	/*!
-	 * Temporary directory to store update files in.
-	 * This will be set to not auto delete. Task will fail if this fails to be created.
-	 */
-	QTemporaryDir m_updateFilesDir;
-
-protected slots:
-	/*!
-	 * This function is called when version information is finished downloading
-	 * and at least the new file list download succeeded
-	 */
-	void processDownloadedVersionInfo();
-	void vinfoDownloadFailed();
-
-	void fileDownloadFinished();
-	void fileDownloadFailed(QString reason);
-	void fileDownloadProgressChanged(qint64 current, qint64 total);
-};
-
-}
\ No newline at end of file
diff --git a/libraries/logic/updater/GoUpdate.cpp b/libraries/logic/updater/GoUpdate.cpp
deleted file mode 100644
index 60d50e04..00000000
--- a/libraries/logic/updater/GoUpdate.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "GoUpdate.h"
-#include <QDebug>
-#include <QDomDocument>
-#include <QFile>
-#include <Env.h>
-#include <FileSystem.h>
-
-namespace GoUpdate
-{
-
-bool parseVersionInfo(const QByteArray &data, VersionFileList &list, QString &error)
-{
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		error = QString("Failed to parse version info JSON: %1 at %2")
-					.arg(jsonError.errorString())
-					.arg(jsonError.offset);
-		qCritical() << error;
-		return false;
-	}
-
-	QJsonObject json = jsonDoc.object();
-
-	qDebug() << data;
-	qDebug() << "Loading version info from JSON.";
-	QJsonArray filesArray = json.value("Files").toArray();
-	for (QJsonValue fileValue : filesArray)
-	{
-		QJsonObject fileObj = fileValue.toObject();
-
-		QString file_path = fileObj.value("Path").toString();
-#ifdef Q_OS_MAC
-		// On OSX, the paths for the updater need to be fixed.
-		// basically, anything that isn't in the .app folder is ignored.
-		// everything else is changed so the code that processes the files actually finds
-		// them and puts the replacements in the right spots.
-		fixPathForOSX(file_path);
-#endif
-		VersionFileEntry file{file_path,		fileObj.value("Perms").toVariant().toInt(),
-							  FileSourceList(), fileObj.value("MD5").toString(), };
-		qDebug() << "File" << file.path << "with perms" << file.mode;
-
-		QJsonArray sourceArray = fileObj.value("Sources").toArray();
-		for (QJsonValue val : sourceArray)
-		{
-			QJsonObject sourceObj = val.toObject();
-
-			QString type = sourceObj.value("SourceType").toString();
-			if (type == "http")
-			{
-				file.sources.append(FileSource("http", sourceObj.value("Url").toString()));
-			}
-			else
-			{
-				qWarning() << "Unknown source type" << type << "ignored.";
-			}
-		}
-
-		qDebug() << "Loaded info for" << file.path;
-
-		list.append(file);
-	}
-
-	return true;
-}
-
-bool processFileLists
-(
-	const VersionFileList &currentVersion,
-	const VersionFileList &newVersion,
-	const QString &rootPath,
-	const QString &tempPath,
-	NetJobPtr job,
-	OperationList &ops
-)
-{
-	// First, if we've loaded the current version's file list, we need to iterate through it and
-	// delete anything in the current one version's list that isn't in the new version's list.
-	for (VersionFileEntry entry : currentVersion)
-	{
-		QFileInfo toDelete(FS::PathCombine(rootPath, entry.path));
-		if (!toDelete.exists())
-		{
-			qCritical() << "Expected file " << toDelete.absoluteFilePath()
-						 << " doesn't exist!";
-		}
-		bool keep = false;
-
-		//
-		for (VersionFileEntry newEntry : newVersion)
-		{
-			if (newEntry.path == entry.path)
-			{
-				qDebug() << "Not deleting" << entry.path
-							 << "because it is still present in the new version.";
-				keep = true;
-				break;
-			}
-		}
-
-		// If the loop reaches the end and we didn't find a match, delete the file.
-		if (!keep)
-		{
-			if (toDelete.exists())
-				ops.append(Operation::DeleteOp(entry.path));
-		}
-	}
-
-	// Next, check each file in MultiMC's folder and see if we need to update them.
-	for (VersionFileEntry entry : newVersion)
-	{
-		// TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a
-		// way to do this in the background.
-		QString fileMD5;
-		QString realEntryPath = FS::PathCombine(rootPath, entry.path);
-		QFile entryFile(realEntryPath);
-		QFileInfo entryInfo(realEntryPath);
-
-		bool needs_upgrade = false;
-		if (!entryFile.exists())
-		{
-			needs_upgrade = true;
-		}
-		else
-		{
-			bool pass = true;
-			if (!entryInfo.isReadable())
-			{
-				qCritical() << "File " << realEntryPath << " is not readable.";
-				pass = false;
-			}
-			if (!entryInfo.isWritable())
-			{
-				qCritical() << "File " << realEntryPath << " is not writable.";
-				pass = false;
-			}
-			if (!entryFile.open(QFile::ReadOnly))
-			{
-				qCritical() << "File " << realEntryPath << " cannot be opened for reading.";
-				pass = false;
-			}
-			if (!pass)
-			{
-				ops.clear();
-				return false;
-			}
-		}
-
-		if(!needs_upgrade)
-		{
-			QCryptographicHash hash(QCryptographicHash::Md5);
-			auto foo = entryFile.readAll();
-
-			hash.addData(foo);
-			fileMD5 = hash.result().toHex();
-			if ((fileMD5 != entry.md5))
-			{
-				qDebug() << "MD5Sum does not match!";
-				qDebug() << "Expected:'" << entry.md5 << "'";
-				qDebug() << "Got:     '" << fileMD5 << "'";
-				needs_upgrade = true;
-			}
-		}
-
-		// skip file. it doesn't need an upgrade.
-		if (!needs_upgrade)
-		{
-			qDebug() << "File" << realEntryPath << " does not need updating.";
-			continue;
-		}
-
-		// yep. this file actually needs an upgrade. PROCEED.
-		qDebug() << "Found file" << realEntryPath << " that needs updating.";
-
-		// Go through the sources list and find one to use.
-		// TODO: Make a NetAction that takes a source list and tries each of them until one
-		// works. For now, we'll just use the first http one.
-		for (FileSource source : entry.sources)
-		{
-			if (source.type != "http")
-				continue;
-
-			qDebug() << "Will download" << entry.path << "from" << source.url;
-
-			// Download it to updatedir/<filepath>-<md5> where filepath is the file's
-			// path with slashes replaced by underscores.
-			QString dlPath = FS::PathCombine(tempPath, QString(entry.path).replace("/", "_"));
-
-			// We need to download the file to the updatefiles folder and add a task
-			// to copy it to its install path.
-			auto download = MD5EtagDownload::make(source.url, dlPath);
-			download->m_expected_md5 = entry.md5;
-			job->addNetAction(download);
-			ops.append(Operation::CopyOp(dlPath, entry.path, entry.mode));
-		}
-	}
-	return true;
-}
-
-bool fixPathForOSX(QString &path)
-{
-	if (path.startsWith("MultiMC.app/"))
-	{
-		// remove the prefix and add a new, more appropriate one.
-		path.remove(0, 12);
-		return true;
-	}
-	else
-	{
-		qCritical() << "Update path not within .app: " << path;
-		return false;
-	}
-}
-}
\ No newline at end of file
diff --git a/libraries/logic/updater/GoUpdate.h b/libraries/logic/updater/GoUpdate.h
deleted file mode 100644
index b8a534de..00000000
--- a/libraries/logic/updater/GoUpdate.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#pragma once
-#include <QByteArray>
-#include <net/NetJob.h>
-
-#include "multimc_logic_export.h"
-
-namespace GoUpdate
-{
-
-/**
- * A temporary object exchanged between updated checker and the actual update task
- */
-struct MULTIMC_LOGIC_EXPORT Status
-{
-	bool updateAvailable = false;
-
-	int newVersionId = -1;
-	QString newRepoUrl;
-
-	int currentVersionId = -1;
-	QString currentRepoUrl;
-
-	// path to the root of the application
-	QString rootPath;
-};
-
-/**
- * Struct that describes an entry in a VersionFileEntry's `Sources` list.
- */
-struct MULTIMC_LOGIC_EXPORT FileSource
-{
-	FileSource(QString type, QString url, QString compression="")
-	{
-		this->type = type;
-		this->url = url;
-		this->compressionType = compression;
-	}
-
-	bool operator==(const FileSource &f2) const
-	{
-		return type == f2.type && url == f2.url && compressionType == f2.compressionType;
-	}
-
-	QString type;
-	QString url;
-	QString compressionType;
-};
-typedef QList<FileSource> FileSourceList;
-
-/**
- * Structure that describes an entry in a GoUpdate version's `Files` list.
- */
-struct MULTIMC_LOGIC_EXPORT VersionFileEntry
-{
-	QString path;
-	int mode;
-	FileSourceList sources;
-	QString md5;
-	bool operator==(const VersionFileEntry &v2) const
-	{
-		return path == v2.path && mode == v2.mode && sources == v2.sources && md5 == v2.md5;
-	}
-};
-typedef QList<VersionFileEntry> VersionFileList;
-
-/**
- * Structure that describes an operation to perform when installing updates.
- */
-struct MULTIMC_LOGIC_EXPORT Operation
-{
-	static Operation CopyOp(QString fsource, QString fdest, int fmode=0644)
-	{
-		return Operation{OP_REPLACE, fsource, fdest, fmode};
-	}
-	static Operation DeleteOp(QString file)
-	{
-		return Operation{OP_DELETE, file, "", 0644};
-	}
-
-	// FIXME: for some types, some of the other fields are irrelevant!
-	bool operator==(const Operation &u2) const
-	{
-		return type == u2.type && file == u2.file && dest == u2.dest && mode == u2.mode;
-	}
-
-	//! Specifies the type of operation that this is.
-	enum Type
-	{
-		OP_REPLACE,
-		OP_DELETE,
-	} type;
-
-	//! The file to operate on.
-	QString file;
-
-	//! The destination file.
-	QString dest;
-
-	//! The mode to change the source file to.
-	int mode;
-};
-typedef QList<Operation> OperationList;
-
-/**
- * Loads the file list from the given version info JSON object into the given list.
- */
-bool MULTIMC_LOGIC_EXPORT parseVersionInfo(const QByteArray &data, VersionFileList& list, QString &error);
-
-/*!
- * Takes a list of file entries for the current version's files and the new version's files
- * and populates the downloadList and operationList with information about how to download and install the update.
- */
-bool MULTIMC_LOGIC_EXPORT processFileLists
-(
-	const VersionFileList &currentVersion,
-	const VersionFileList &newVersion,
-	const QString &rootPath,
-	const QString &tempPath,
-	NetJobPtr job,
-	OperationList &ops
-);
-
-/*!
- * This fixes destination paths for OSX - removes 'MultiMC.app' prefix
- * The updater runs in MultiMC.app/Contents/MacOs by default
- * The destination paths are such as this: MultiMC.app/blah/blah
- *
- * @return false if the path couldn't be fixed (is invalid)
- */
-bool MULTIMC_LOGIC_EXPORT fixPathForOSX(QString &path);
-
-}
-Q_DECLARE_METATYPE(GoUpdate::Status);
\ No newline at end of file
diff --git a/libraries/logic/updater/UpdateChecker.cpp b/libraries/logic/updater/UpdateChecker.cpp
deleted file mode 100644
index 1cdac916..00000000
--- a/libraries/logic/updater/UpdateChecker.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "UpdateChecker.h"
-
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QDebug>
-
-#define API_VERSION 0
-#define CHANLIST_FORMAT 0
-
-UpdateChecker::UpdateChecker(QString channelListUrl, QString currentChannel, int currentBuild)
-{
-	m_channelListUrl = channelListUrl;
-	m_currentChannel = currentChannel;
-	m_currentBuild = currentBuild;
-
-	m_updateChecking = false;
-	m_chanListLoading = false;
-	m_checkUpdateWaiting = false;
-	m_chanListLoaded = false;
-}
-
-QList<UpdateChecker::ChannelListEntry> UpdateChecker::getChannelList() const
-{
-	return m_channels;
-}
-
-bool UpdateChecker::hasChannels() const
-{
-	return !m_channels.isEmpty();
-}
-
-void UpdateChecker::checkForUpdate(QString updateChannel, bool notifyNoUpdate)
-{
-	qDebug() << "Checking for updates.";
-
-	// If the channel list hasn't loaded yet, load it and defer checking for updates until
-	// later.
-	if (!m_chanListLoaded)
-	{
-		qDebug() << "Channel list isn't loaded yet. Loading channel list and deferring "
-						"update check.";
-		m_checkUpdateWaiting = true;
-		m_deferredUpdateChannel = updateChannel;
-		updateChanList(notifyNoUpdate);
-		return;
-	}
-
-	if (m_updateChecking)
-	{
-		qDebug() << "Ignoring update check request. Already checking for updates.";
-		return;
-	}
-
-	m_updateChecking = true;
-
-	// Find the desired channel within the channel list and get its repo URL. If if cannot be
-	// found, error.
-	m_newRepoUrl = "";
-	for (ChannelListEntry entry : m_channels)
-	{
-		if (entry.id == updateChannel)
-			m_newRepoUrl = entry.url;
-		if (entry.id == m_currentChannel)
-			m_currentRepoUrl = entry.url;
-	}
-
-	qDebug() << "m_repoUrl = " << m_newRepoUrl;
-
-	// If we didn't find our channel, error.
-	if (m_newRepoUrl.isEmpty())
-	{
-		qCritical() << "m_repoUrl is empty!";
-		emit updateCheckFailed();
-		return;
-	}
-
-	QUrl indexUrl = QUrl(m_newRepoUrl).resolved(QUrl("index.json"));
-
-	auto job = new NetJob("GoUpdate Repository Index");
-	job->addNetAction(ByteArrayDownload::make(indexUrl));
-	connect(job, &NetJob::succeeded, [this, notifyNoUpdate]()
-	{ updateCheckFinished(notifyNoUpdate); });
-	connect(job, &NetJob::failed, this, &UpdateChecker::updateCheckFailed);
-	indexJob.reset(job);
-	job->start();
-}
-
-void UpdateChecker::updateCheckFinished(bool notifyNoUpdate)
-{
-	qDebug() << "Finished downloading repo index. Checking for new versions.";
-
-	QJsonParseError jsonError;
-	QByteArray data;
-	{
-		ByteArrayDownloadPtr dl =
-			std::dynamic_pointer_cast<ByteArrayDownload>(indexJob->first());
-		data = dl->m_data;
-		indexJob.reset();
-	}
-
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError || !jsonDoc.isObject())
-	{
-		qCritical() << "Failed to parse GoUpdate repository index. JSON error"
-					 << jsonError.errorString() << "at offset" << jsonError.offset;
-		return;
-	}
-
-	QJsonObject object = jsonDoc.object();
-
-	bool success = false;
-	int apiVersion = object.value("ApiVersion").toVariant().toInt(&success);
-	if (apiVersion != API_VERSION || !success)
-	{
-		qCritical() << "Failed to check for updates. API version mismatch. We're using"
-					 << API_VERSION << "server has" << apiVersion;
-		return;
-	}
-
-	qDebug() << "Processing repository version list.";
-	QJsonObject newestVersion;
-	QJsonArray versions = object.value("Versions").toArray();
-	for (QJsonValue versionVal : versions)
-	{
-		QJsonObject version = versionVal.toObject();
-		if (newestVersion.value("Id").toVariant().toInt() <
-			version.value("Id").toVariant().toInt())
-		{
-			newestVersion = version;
-		}
-	}
-
-	// We've got the version with the greatest ID number. Now compare it to our current build
-	// number and update if they're different.
-	int newBuildNumber = newestVersion.value("Id").toVariant().toInt();
-	if (newBuildNumber != m_currentBuild)
-	{
-		qDebug() << "Found newer version with ID" << newBuildNumber;
-		// Update!
-		GoUpdate::Status updateStatus;
-		updateStatus.updateAvailable = true;
-		updateStatus.currentVersionId = m_currentBuild;
-		updateStatus.currentRepoUrl = m_currentRepoUrl;
-		updateStatus.newVersionId = newBuildNumber;
-		updateStatus.newRepoUrl = m_newRepoUrl;
-		emit updateAvailable(updateStatus);
-	}
-	else if (notifyNoUpdate)
-	{
-		emit noUpdateFound();
-	}
-
-	m_updateChecking = false;
-}
-
-void UpdateChecker::updateCheckFailed()
-{
-	qCritical() << "Update check failed for reasons unknown.";
-}
-
-void UpdateChecker::updateChanList(bool notifyNoUpdate)
-{
-	qDebug() << "Loading the channel list.";
-
-	if (m_channelListUrl.isEmpty())
-	{
-		qCritical() << "Failed to update channel list. No channel list URL set."
-					<< "If you'd like to use MultiMC's update system, please pass the channel "
-						"list URL to CMake at compile time.";
-		return;
-	}
-
-	m_chanListLoading = true;
-	NetJob *job = new NetJob("Update System Channel List");
-	job->addNetAction(ByteArrayDownload::make(QUrl(m_channelListUrl)));
-	connect(job, &NetJob::succeeded, [this, notifyNoUpdate]()
-	{ chanListDownloadFinished(notifyNoUpdate); });
-	QObject::connect(job, &NetJob::failed, this, &UpdateChecker::chanListDownloadFailed);
-	chanListJob.reset(job);
-	job->start();
-}
-
-void UpdateChecker::chanListDownloadFinished(bool notifyNoUpdate)
-{
-	QByteArray data;
-	{
-		ByteArrayDownloadPtr dl =
-			std::dynamic_pointer_cast<ByteArrayDownload>(chanListJob->first());
-		data = dl->m_data;
-		chanListJob.reset();
-	}
-
-	QJsonParseError jsonError;
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
-	if (jsonError.error != QJsonParseError::NoError)
-	{
-		// TODO: Report errors to the user.
-		qCritical() << "Failed to parse channel list JSON:" << jsonError.errorString() << "at"
-					 << jsonError.offset;
-		return;
-	}
-
-	QJsonObject object = jsonDoc.object();
-
-	bool success = false;
-	int formatVersion = object.value("format_version").toVariant().toInt(&success);
-	if (formatVersion != CHANLIST_FORMAT || !success)
-	{
-		qCritical()
-			<< "Failed to check for updates. Channel list format version mismatch. We're using"
-			<< CHANLIST_FORMAT << "server has" << formatVersion;
-		return;
-	}
-
-	// Load channels into a temporary array.
-	QList<ChannelListEntry> loadedChannels;
-	QJsonArray channelArray = object.value("channels").toArray();
-	for (QJsonValue chanVal : channelArray)
-	{
-		QJsonObject channelObj = chanVal.toObject();
-		ChannelListEntry entry{channelObj.value("id").toVariant().toString(),
-							   channelObj.value("name").toVariant().toString(),
-							   channelObj.value("description").toVariant().toString(),
-							   channelObj.value("url").toVariant().toString()};
-		if (entry.id.isEmpty() || entry.name.isEmpty() || entry.url.isEmpty())
-		{
-			qCritical() << "Channel list entry with empty ID, name, or URL. Skipping.";
-			continue;
-		}
-		loadedChannels.append(entry);
-	}
-
-	// Swap  the channel list we just loaded into the object's channel list.
-	m_channels.swap(loadedChannels);
-
-	m_chanListLoading = false;
-	m_chanListLoaded = true;
-	qDebug() << "Successfully loaded UpdateChecker channel list.";
-
-	// If we're waiting to check for updates, do that now.
-	if (m_checkUpdateWaiting)
-		checkForUpdate(m_deferredUpdateChannel, notifyNoUpdate);
-
-	emit channelListLoaded();
-}
-
-void UpdateChecker::chanListDownloadFailed(QString reason)
-{
-	m_chanListLoading = false;
-	qCritical() << QString("Failed to download channel list: %1").arg(reason);
-	emit channelListLoaded();
-}
-
diff --git a/libraries/logic/updater/UpdateChecker.h b/libraries/logic/updater/UpdateChecker.h
deleted file mode 100644
index c7fad10e..00000000
--- a/libraries/logic/updater/UpdateChecker.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "net/NetJob.h"
-#include "GoUpdate.h"
-
-#include <QUrl>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT UpdateChecker : public QObject
-{
-	Q_OBJECT
-
-public:
-	UpdateChecker(QString channelListUrl, QString currentChannel, int currentBuild);
-	void checkForUpdate(QString updateChannel, bool notifyNoUpdate);
-
-	/*!
-	 * Causes the update checker to download the channel list from the URL specified in config.h (generated by CMake).
-	 * If this isn't called before checkForUpdate(), it will automatically be called.
-	 */
-	void updateChanList(bool notifyNoUpdate);
-
-	/*!
-	 * An entry in the channel list.
-	 */
-	struct ChannelListEntry
-	{
-		QString id;
-		QString name;
-		QString description;
-		QString url;
-	};
-
-	/*!
-	 * Returns a the current channel list.
-	 * If the channel list hasn't been loaded, this list will be empty.
-	 */
-	QList<ChannelListEntry> getChannelList() const;
-
-	/*!
-	 * Returns false if the channel list is empty.
-	 */
-	bool hasChannels() const;
-
-signals:
-	//! Signal emitted when an update is available. Passes the URL for the repo and the ID and name for the version.
-	void updateAvailable(GoUpdate::Status status);
-
-	//! Signal emitted when the channel list finishes loading or fails to load.
-	void channelListLoaded();
-
-	void noUpdateFound();
-
-private slots:
-	void updateCheckFinished(bool notifyNoUpdate);
-	void updateCheckFailed();
-
-	void chanListDownloadFinished(bool notifyNoUpdate);
-	void chanListDownloadFailed(QString reason);
-
-private:
-	friend class UpdateCheckerTest;
-
-	NetJobPtr indexJob;
-	NetJobPtr chanListJob;
-
-	QString m_channelListUrl;
-
-	QList<ChannelListEntry> m_channels;
-
-	/*!
-	 * True while the system is checking for updates.
-	 * If checkForUpdate is called while this is true, it will be ignored.
-	 */
-	bool m_updateChecking;
-
-	/*!
-	 * True if the channel list has loaded.
-	 * If this is false, trying to check for updates will call updateChanList first.
-	 */
-	bool m_chanListLoaded;
-
-	/*!
-	 * Set to true while the channel list is currently loading.
-	 */
-	bool m_chanListLoading;
-
-	/*!
-	 * Set to true when checkForUpdate is called while the channel list isn't loaded.
-	 * When the channel list finishes loading, if this is true, the update checker will check for updates.
-	 */
-	bool m_checkUpdateWaiting;
-
-	/*!
-	 * if m_checkUpdateWaiting, this is the last used update channel
-	 */
-	QString m_deferredUpdateChannel;
-
-	int m_currentBuild = -1;
-	QString m_currentChannel;
-	QString m_currentRepoUrl;
-
-	QString m_newRepoUrl;
-};
-
diff --git a/libraries/logic/wonko/BaseWonkoEntity.cpp b/libraries/logic/wonko/BaseWonkoEntity.cpp
deleted file mode 100644
index f5c59363..00000000
--- a/libraries/logic/wonko/BaseWonkoEntity.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseWonkoEntity.h"
-
-#include "Json.h"
-#include "WonkoUtil.h"
-
-BaseWonkoEntity::~BaseWonkoEntity()
-{
-}
-
-void BaseWonkoEntity::store() const
-{
-	Json::write(serialized(), Wonko::localWonkoDir().absoluteFilePath(localFilename()));
-}
-
-void BaseWonkoEntity::notifyLocalLoadComplete()
-{
-	m_localLoaded = true;
-	store();
-}
-void BaseWonkoEntity::notifyRemoteLoadComplete()
-{
-	m_remoteLoaded = true;
-	store();
-}
diff --git a/libraries/logic/wonko/BaseWonkoEntity.h b/libraries/logic/wonko/BaseWonkoEntity.h
deleted file mode 100644
index 191b4184..00000000
--- a/libraries/logic/wonko/BaseWonkoEntity.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QObject>
-#include <memory>
-
-#include "multimc_logic_export.h"
-
-class Task;
-
-class MULTIMC_LOGIC_EXPORT BaseWonkoEntity
-{
-public:
-	virtual ~BaseWonkoEntity();
-
-	using Ptr = std::shared_ptr<BaseWonkoEntity>;
-
-	virtual std::unique_ptr<Task> remoteUpdateTask() = 0;
-	virtual std::unique_ptr<Task> localUpdateTask() = 0;
-	virtual void merge(const std::shared_ptr<BaseWonkoEntity> &other) = 0;
-
-	void store() const;
-	virtual QString localFilename() const = 0;
-	virtual QJsonObject serialized() const = 0;
-
-	bool isComplete() const { return m_localLoaded || m_remoteLoaded; }
-
-	bool isLocalLoaded() const { return m_localLoaded; }
-	bool isRemoteLoaded() const { return m_remoteLoaded; }
-
-	void notifyLocalLoadComplete();
-	void notifyRemoteLoadComplete();
-
-private:
-	bool m_localLoaded = false;
-	bool m_remoteLoaded = false;
-};
diff --git a/libraries/logic/wonko/WonkoIndex.cpp b/libraries/logic/wonko/WonkoIndex.cpp
deleted file mode 100644
index 8306af84..00000000
--- a/libraries/logic/wonko/WonkoIndex.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoIndex.h"
-
-#include "WonkoVersionList.h"
-#include "tasks/BaseWonkoEntityLocalLoadTask.h"
-#include "tasks/BaseWonkoEntityRemoteLoadTask.h"
-#include "format/WonkoFormat.h"
-
-WonkoIndex::WonkoIndex(QObject *parent)
-	: QAbstractListModel(parent)
-{
-}
-WonkoIndex::WonkoIndex(const QVector<WonkoVersionListPtr> &lists, QObject *parent)
-	: QAbstractListModel(parent), m_lists(lists)
-{
-	for (int i = 0; i < m_lists.size(); ++i)
-	{
-		m_uids.insert(m_lists.at(i)->uid(), m_lists.at(i));
-		connectVersionList(i, m_lists.at(i));
-	}
-}
-
-QVariant WonkoIndex::data(const QModelIndex &index, int role) const
-{
-	if (index.parent().isValid() || index.row() < 0 || index.row() >= m_lists.size())
-	{
-		return QVariant();
-	}
-
-	WonkoVersionListPtr list = m_lists.at(index.row());
-	switch (role)
-	{
-	case Qt::DisplayRole:
-		switch (index.column())
-		{
-		case 0: return list->humanReadable();
-		default: break;
-		}
-	case UidRole: return list->uid();
-	case NameRole: return list->name();
-	case ListPtrRole: return QVariant::fromValue(list);
-	}
-	return QVariant();
-}
-int WonkoIndex::rowCount(const QModelIndex &parent) const
-{
-	return m_lists.size();
-}
-int WonkoIndex::columnCount(const QModelIndex &parent) const
-{
-	return 1;
-}
-QVariant WonkoIndex::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	if (orientation == Qt::Horizontal && role == Qt::DisplayRole && section == 0)
-	{
-		return tr("Name");
-	}
-	else
-	{
-		return QVariant();
-	}
-}
-
-std::unique_ptr<Task> WonkoIndex::remoteUpdateTask()
-{
-	return std::unique_ptr<WonkoIndexRemoteLoadTask>(new WonkoIndexRemoteLoadTask(this, this));
-}
-std::unique_ptr<Task> WonkoIndex::localUpdateTask()
-{
-	return std::unique_ptr<WonkoIndexLocalLoadTask>(new WonkoIndexLocalLoadTask(this, this));
-}
-
-QJsonObject WonkoIndex::serialized() const
-{
-	return WonkoFormat::serializeIndex(this);
-}
-
-bool WonkoIndex::hasUid(const QString &uid) const
-{
-	return m_uids.contains(uid);
-}
-WonkoVersionListPtr WonkoIndex::getList(const QString &uid) const
-{
-	return m_uids.value(uid, nullptr);
-}
-WonkoVersionListPtr WonkoIndex::getListGuaranteed(const QString &uid) const
-{
-	return m_uids.value(uid, std::make_shared<WonkoVersionList>(uid));
-}
-
-void WonkoIndex::merge(const Ptr &other)
-{
-	const QVector<WonkoVersionListPtr> lists = std::dynamic_pointer_cast<WonkoIndex>(other)->m_lists;
-	// initial load, no need to merge
-	if (m_lists.isEmpty())
-	{
-		beginResetModel();
-		m_lists = lists;
-		for (int i = 0; i < lists.size(); ++i)
-		{
-			m_uids.insert(lists.at(i)->uid(), lists.at(i));
-			connectVersionList(i, lists.at(i));
-		}
-		endResetModel();
-	}
-	else
-	{
-		for (const WonkoVersionListPtr &list : lists)
-		{
-			if (m_uids.contains(list->uid()))
-			{
-				m_uids[list->uid()]->merge(list);
-			}
-			else
-			{
-				beginInsertRows(QModelIndex(), m_lists.size(), m_lists.size());
-				connectVersionList(m_lists.size(), list);
-				m_lists.append(list);
-				m_uids.insert(list->uid(), list);
-				endInsertRows();
-			}
-		}
-	}
-}
-
-void WonkoIndex::connectVersionList(const int row, const WonkoVersionListPtr &list)
-{
-	connect(list.get(), &WonkoVersionList::nameChanged, this, [this, row]()
-	{
-		emit dataChanged(index(row), index(row), QVector<int>() << Qt::DisplayRole);
-	});
-}
diff --git a/libraries/logic/wonko/WonkoIndex.h b/libraries/logic/wonko/WonkoIndex.h
deleted file mode 100644
index 8b149c7d..00000000
--- a/libraries/logic/wonko/WonkoIndex.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <memory>
-
-#include "BaseWonkoEntity.h"
-
-#include "multimc_logic_export.h"
-
-class Task;
-using WonkoVersionListPtr = std::shared_ptr<class WonkoVersionList>;
-
-class MULTIMC_LOGIC_EXPORT WonkoIndex : public QAbstractListModel, public BaseWonkoEntity
-{
-	Q_OBJECT
-public:
-	explicit WonkoIndex(QObject *parent = nullptr);
-	explicit WonkoIndex(const QVector<WonkoVersionListPtr> &lists, QObject *parent = nullptr);
-
-	enum
-	{
-		UidRole = Qt::UserRole,
-		NameRole,
-		ListPtrRole
-	};
-
-	QVariant data(const QModelIndex &index, int role) const override;
-	int rowCount(const QModelIndex &parent) const override;
-	int columnCount(const QModelIndex &parent) const override;
-	QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-
-	std::unique_ptr<Task> remoteUpdateTask() override;
-	std::unique_ptr<Task> localUpdateTask() override;
-
-	QString localFilename() const override { return "index.json"; }
-	QJsonObject serialized() const override;
-
-	// queries
-	bool hasUid(const QString &uid) const;
-	WonkoVersionListPtr getList(const QString &uid) const;
-	WonkoVersionListPtr getListGuaranteed(const QString &uid) const;
-
-	QVector<WonkoVersionListPtr> lists() const { return m_lists; }
-
-public: // for usage by parsers only
-	void merge(const BaseWonkoEntity::Ptr &other);
-
-private:
-	QVector<WonkoVersionListPtr> m_lists;
-	QHash<QString, WonkoVersionListPtr> m_uids;
-
-	void connectVersionList(const int row, const WonkoVersionListPtr &list);
-};
diff --git a/libraries/logic/wonko/WonkoReference.cpp b/libraries/logic/wonko/WonkoReference.cpp
deleted file mode 100644
index 519d59aa..00000000
--- a/libraries/logic/wonko/WonkoReference.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoReference.h"
-
-WonkoReference::WonkoReference(const QString &uid)
-	: m_uid(uid)
-{
-}
-
-QString WonkoReference::uid() const
-{
-	return m_uid;
-}
-
-QString WonkoReference::version() const
-{
-	return m_version;
-}
-void WonkoReference::setVersion(const QString &version)
-{
-	m_version = version;
-}
-
-bool WonkoReference::operator==(const WonkoReference &other) const
-{
-	return m_uid == other.m_uid && m_version == other.m_version;
-}
-bool WonkoReference::operator!=(const WonkoReference &other) const
-{
-	return m_uid != other.m_uid || m_version != other.m_version;
-}
diff --git a/libraries/logic/wonko/WonkoReference.h b/libraries/logic/wonko/WonkoReference.h
deleted file mode 100644
index 73a85d76..00000000
--- a/libraries/logic/wonko/WonkoReference.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QString>
-#include <QMetaType>
-
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT WonkoReference
-{
-public:
-	WonkoReference() {}
-	explicit WonkoReference(const QString &uid);
-
-	QString uid() const;
-
-	QString version() const;
-	void setVersion(const QString &version);
-
-	bool operator==(const WonkoReference &other) const;
-	bool operator!=(const WonkoReference &other) const;
-
-private:
-	QString m_uid;
-	QString m_version;
-};
-Q_DECLARE_METATYPE(WonkoReference)
diff --git a/libraries/logic/wonko/WonkoUtil.cpp b/libraries/logic/wonko/WonkoUtil.cpp
deleted file mode 100644
index 94726c6b..00000000
--- a/libraries/logic/wonko/WonkoUtil.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoUtil.h"
-
-#include <QUrl>
-#include <QDir>
-
-#include "Env.h"
-
-namespace Wonko
-{
-QUrl rootUrl()
-{
-	return ENV.wonkoRootUrl();
-}
-QUrl indexUrl()
-{
-	return rootUrl().resolved(QStringLiteral("index.json"));
-}
-QUrl versionListUrl(const QString &uid)
-{
-	return rootUrl().resolved(uid + ".json");
-}
-QUrl versionUrl(const QString &uid, const QString &version)
-{
-	return rootUrl().resolved(uid + "/" + version + ".json");
-}
-
-QDir localWonkoDir()
-{
-	return QDir("wonko");
-}
-
-}
diff --git a/libraries/logic/wonko/WonkoVersion.cpp b/libraries/logic/wonko/WonkoVersion.cpp
deleted file mode 100644
index 7b7da86c..00000000
--- a/libraries/logic/wonko/WonkoVersion.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoVersion.h"
-
-#include <QDateTime>
-
-#include "tasks/BaseWonkoEntityLocalLoadTask.h"
-#include "tasks/BaseWonkoEntityRemoteLoadTask.h"
-#include "format/WonkoFormat.h"
-
-WonkoVersion::WonkoVersion(const QString &uid, const QString &version)
-	: BaseVersion(), m_uid(uid), m_version(version)
-{
-}
-
-QString WonkoVersion::descriptor()
-{
-	return m_version;
-}
-QString WonkoVersion::name()
-{
-	return m_version;
-}
-QString WonkoVersion::typeString() const
-{
-	return m_type;
-}
-
-QDateTime WonkoVersion::time() const
-{
-	return QDateTime::fromMSecsSinceEpoch(m_time * 1000, Qt::UTC);
-}
-
-std::unique_ptr<Task> WonkoVersion::remoteUpdateTask()
-{
-	return std::unique_ptr<WonkoVersionRemoteLoadTask>(new WonkoVersionRemoteLoadTask(this, this));
-}
-std::unique_ptr<Task> WonkoVersion::localUpdateTask()
-{
-	return std::unique_ptr<WonkoVersionLocalLoadTask>(new WonkoVersionLocalLoadTask(this, this));
-}
-
-void WonkoVersion::merge(const std::shared_ptr<BaseWonkoEntity> &other)
-{
-	WonkoVersionPtr version = std::dynamic_pointer_cast<WonkoVersion>(other);
-	if (m_type != version->m_type)
-	{
-		setType(version->m_type);
-	}
-	if (m_time != version->m_time)
-	{
-		setTime(version->m_time);
-	}
-	if (m_requires != version->m_requires)
-	{
-		setRequires(version->m_requires);
-	}
-
-	setData(version->m_data);
-}
-
-QString WonkoVersion::localFilename() const
-{
-	return m_uid + '/' + m_version + ".json";
-}
-QJsonObject WonkoVersion::serialized() const
-{
-	return WonkoFormat::serializeVersion(this);
-}
-
-void WonkoVersion::setType(const QString &type)
-{
-	m_type = type;
-	emit typeChanged();
-}
-void WonkoVersion::setTime(const qint64 time)
-{
-	m_time = time;
-	emit timeChanged();
-}
-void WonkoVersion::setRequires(const QVector<WonkoReference> &requires)
-{
-	m_requires = requires;
-	emit requiresChanged();
-}
-void WonkoVersion::setData(const VersionFilePtr &data)
-{
-	m_data = data;
-}
diff --git a/libraries/logic/wonko/WonkoVersion.h b/libraries/logic/wonko/WonkoVersion.h
deleted file mode 100644
index a1de4d9b..00000000
--- a/libraries/logic/wonko/WonkoVersion.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "BaseVersion.h"
-#include "BaseWonkoEntity.h"
-
-#include <QVector>
-#include <QStringList>
-#include <QJsonObject>
-#include <memory>
-
-#include "minecraft/VersionFile.h"
-#include "WonkoReference.h"
-
-#include "multimc_logic_export.h"
-
-using WonkoVersionPtr = std::shared_ptr<class WonkoVersion>;
-
-class MULTIMC_LOGIC_EXPORT WonkoVersion : public QObject, public BaseVersion, public BaseWonkoEntity
-{
-	Q_OBJECT
-	Q_PROPERTY(QString uid READ uid CONSTANT)
-	Q_PROPERTY(QString version READ version CONSTANT)
-	Q_PROPERTY(QString type READ type NOTIFY typeChanged)
-	Q_PROPERTY(QDateTime time READ time NOTIFY timeChanged)
-	Q_PROPERTY(QVector<WonkoReference> requires READ requires NOTIFY requiresChanged)
-public:
-	explicit WonkoVersion(const QString &uid, const QString &version);
-
-	QString descriptor() override;
-	QString name() override;
-	QString typeString() const override;
-
-	QString uid() const { return m_uid; }
-	QString version() const { return m_version; }
-	QString type() const { return m_type; }
-	QDateTime time() const;
-	qint64 rawTime() const { return m_time; }
-	QVector<WonkoReference> requires() const { return m_requires; }
-	VersionFilePtr data() const { return m_data; }
-
-	std::unique_ptr<Task> remoteUpdateTask() override;
-	std::unique_ptr<Task> localUpdateTask() override;
-	void merge(const std::shared_ptr<BaseWonkoEntity> &other) override;
-
-	QString localFilename() const override;
-	QJsonObject serialized() const override;
-
-public: // for usage by format parsers only
-	void setType(const QString &type);
-	void setTime(const qint64 time);
-	void setRequires(const QVector<WonkoReference> &requires);
-	void setData(const VersionFilePtr &data);
-
-signals:
-	void typeChanged();
-	void timeChanged();
-	void requiresChanged();
-
-private:
-	QString m_uid;
-	QString m_version;
-	QString m_type;
-	qint64 m_time;
-	QVector<WonkoReference> m_requires;
-	VersionFilePtr m_data;
-};
-
-Q_DECLARE_METATYPE(WonkoVersionPtr)
diff --git a/libraries/logic/wonko/WonkoVersionList.cpp b/libraries/logic/wonko/WonkoVersionList.cpp
deleted file mode 100644
index e9d79327..00000000
--- a/libraries/logic/wonko/WonkoVersionList.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoVersionList.h"
-
-#include <QDateTime>
-
-#include "WonkoVersion.h"
-#include "tasks/BaseWonkoEntityRemoteLoadTask.h"
-#include "tasks/BaseWonkoEntityLocalLoadTask.h"
-#include "format/WonkoFormat.h"
-#include "WonkoReference.h"
-
-class WVLLoadTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit WVLLoadTask(WonkoVersionList *list, QObject *parent = nullptr)
-		: Task(parent), m_list(list)
-	{
-	}
-
-	bool canAbort() const override
-	{
-		return !m_currentTask || m_currentTask->canAbort();
-	}
-	bool abort() override
-	{
-		return m_currentTask->abort();
-	}
-
-private:
-	void executeTask() override
-	{
-		if (!m_list->isLocalLoaded())
-		{
-			m_currentTask = m_list->localUpdateTask();
-			connect(m_currentTask.get(), &Task::succeeded, this, &WVLLoadTask::next);
-		}
-		else
-		{
-			m_currentTask = m_list->remoteUpdateTask();
-			connect(m_currentTask.get(), &Task::succeeded, this, &WVLLoadTask::emitSucceeded);
-		}
-		connect(m_currentTask.get(), &Task::status, this, &WVLLoadTask::setStatus);
-		connect(m_currentTask.get(), &Task::progress, this, &WVLLoadTask::setProgress);
-		connect(m_currentTask.get(), &Task::failed, this, &WVLLoadTask::emitFailed);
-		m_currentTask->start();
-	}
-
-	void next()
-	{
-		m_currentTask = m_list->remoteUpdateTask();
-		connect(m_currentTask.get(), &Task::status, this, &WVLLoadTask::setStatus);
-		connect(m_currentTask.get(), &Task::progress, this, &WVLLoadTask::setProgress);
-		connect(m_currentTask.get(), &Task::succeeded, this, &WVLLoadTask::emitSucceeded);
-		m_currentTask->start();
-	}
-
-	WonkoVersionList *m_list;
-	std::unique_ptr<Task> m_currentTask;
-};
-
-WonkoVersionList::WonkoVersionList(const QString &uid, QObject *parent)
-	: BaseVersionList(parent), m_uid(uid)
-{
-	setObjectName("Wonko version list: " + uid);
-}
-
-Task *WonkoVersionList::getLoadTask()
-{
-	return new WVLLoadTask(this);
-}
-
-bool WonkoVersionList::isLoaded()
-{
-	return isLocalLoaded() && isRemoteLoaded();
-}
-
-const BaseVersionPtr WonkoVersionList::at(int i) const
-{
-	return m_versions.at(i);
-}
-int WonkoVersionList::count() const
-{
-	return m_versions.size();
-}
-
-void WonkoVersionList::sortVersions()
-{
-	beginResetModel();
-	std::sort(m_versions.begin(), m_versions.end(), [](const WonkoVersionPtr &a, const WonkoVersionPtr &b)
-	{
-		return *a.get() < *b.get();
-	});
-	endResetModel();
-}
-
-QVariant WonkoVersionList::data(const QModelIndex &index, int role) const
-{
-	if (!index.isValid() || index.row() < 0 || index.row() >= m_versions.size() || index.parent().isValid())
-	{
-		return QVariant();
-	}
-
-	WonkoVersionPtr version = m_versions.at(index.row());
-
-	switch (role)
-	{
-	case VersionPointerRole: return QVariant::fromValue(std::dynamic_pointer_cast<BaseVersion>(version));
-	case VersionRole:
-	case VersionIdRole:
-		return version->version();
-	case ParentGameVersionRole:
-	{
-		const auto end = version->requires().end();
-		const auto it = std::find_if(version->requires().begin(), end,
-									 [](const WonkoReference &ref) { return ref.uid() == "net.minecraft"; });
-		if (it != end)
-		{
-			return (*it).version();
-		}
-		return QVariant();
-	}
-	case TypeRole: return version->type();
-
-	case UidRole: return version->uid();
-	case TimeRole: return version->time();
-	case RequiresRole: return QVariant::fromValue(version->requires());
-	case SortRole: return version->rawTime();
-	case WonkoVersionPtrRole: return QVariant::fromValue(version);
-	case RecommendedRole: return version == getRecommended();
-	case LatestRole: return version == getLatestStable();
-	default: return QVariant();
-	}
-}
-
-BaseVersionList::RoleList WonkoVersionList::providesRoles() const
-{
-	return {VersionPointerRole, VersionRole, VersionIdRole, ParentGameVersionRole,
-				TypeRole, UidRole, TimeRole, RequiresRole, SortRole,
-				RecommendedRole, LatestRole, WonkoVersionPtrRole};
-}
-
-QHash<int, QByteArray> WonkoVersionList::roleNames() const
-{
-	QHash<int, QByteArray> roles = BaseVersionList::roleNames();
-	roles.insert(UidRole, "uid");
-	roles.insert(TimeRole, "time");
-	roles.insert(SortRole, "sort");
-	roles.insert(RequiresRole, "requires");
-	return roles;
-}
-
-std::unique_ptr<Task> WonkoVersionList::remoteUpdateTask()
-{
-	return std::unique_ptr<WonkoVersionListRemoteLoadTask>(new WonkoVersionListRemoteLoadTask(this, this));
-}
-std::unique_ptr<Task> WonkoVersionList::localUpdateTask()
-{
-	return std::unique_ptr<WonkoVersionListLocalLoadTask>(new WonkoVersionListLocalLoadTask(this, this));
-}
-
-QString WonkoVersionList::localFilename() const
-{
-	return m_uid + ".json";
-}
-QJsonObject WonkoVersionList::serialized() const
-{
-	return WonkoFormat::serializeVersionList(this);
-}
-
-QString WonkoVersionList::humanReadable() const
-{
-	return m_name.isEmpty() ? m_uid : m_name;
-}
-
-bool WonkoVersionList::hasVersion(const QString &version) const
-{
-	return m_lookup.contains(version);
-}
-WonkoVersionPtr WonkoVersionList::getVersion(const QString &version) const
-{
-	return m_lookup.value(version);
-}
-
-void WonkoVersionList::setName(const QString &name)
-{
-	m_name = name;
-	emit nameChanged(name);
-}
-void WonkoVersionList::setVersions(const QVector<WonkoVersionPtr> &versions)
-{
-	beginResetModel();
-	m_versions = versions;
-	std::sort(m_versions.begin(), m_versions.end(), [](const WonkoVersionPtr &a, const WonkoVersionPtr &b)
-	{
-		return a->rawTime() > b->rawTime();
-	});
-	for (int i = 0; i < m_versions.size(); ++i)
-	{
-		m_lookup.insert(m_versions.at(i)->version(), m_versions.at(i));
-		setupAddedVersion(i, m_versions.at(i));
-	}
-
-	m_latest = m_versions.isEmpty() ? nullptr : m_versions.first();
-	auto recommendedIt = std::find_if(m_versions.constBegin(), m_versions.constEnd(), [](const WonkoVersionPtr &ptr) { return ptr->type() == "release"; });
-	m_recommended = recommendedIt == m_versions.constEnd() ? nullptr : *recommendedIt;
-	endResetModel();
-}
-
-void WonkoVersionList::merge(const BaseWonkoEntity::Ptr &other)
-{
-	const WonkoVersionListPtr list = std::dynamic_pointer_cast<WonkoVersionList>(other);
-	if (m_name != list->m_name)
-	{
-		setName(list->m_name);
-	}
-
-	if (m_versions.isEmpty())
-	{
-		setVersions(list->m_versions);
-	}
-	else
-	{
-		for (const WonkoVersionPtr &version : list->m_versions)
-		{
-			if (m_lookup.contains(version->version()))
-			{
-				m_lookup.value(version->version())->merge(version);
-			}
-			else
-			{
-				beginInsertRows(QModelIndex(), m_versions.size(), m_versions.size());
-				setupAddedVersion(m_versions.size(), version);
-				m_versions.append(version);
-				m_lookup.insert(version->uid(), version);
-				endInsertRows();
-
-				if (!m_latest || version->rawTime() > m_latest->rawTime())
-				{
-					m_latest = version;
-					emit dataChanged(index(0), index(m_versions.size() - 1), QVector<int>() << LatestRole);
-				}
-				if (!m_recommended || (version->type() == "release" && version->rawTime() > m_recommended->rawTime()))
-				{
-					m_recommended = version;
-					emit dataChanged(index(0), index(m_versions.size() - 1), QVector<int>() << RecommendedRole);
-				}
-			}
-		}
-	}
-}
-
-void WonkoVersionList::setupAddedVersion(const int row, const WonkoVersionPtr &version)
-{
-	connect(version.get(), &WonkoVersion::requiresChanged, this, [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << RequiresRole); });
-	connect(version.get(), &WonkoVersion::timeChanged, this, [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << TimeRole << SortRole); });
-	connect(version.get(), &WonkoVersion::typeChanged, this, [this, row]() { emit dataChanged(index(row), index(row), QVector<int>() << TypeRole); });
-}
-
-BaseVersionPtr WonkoVersionList::getLatestStable() const
-{
-	return m_latest;
-}
-BaseVersionPtr WonkoVersionList::getRecommended() const
-{
-	return m_recommended;
-}
-
-#include "WonkoVersionList.moc"
diff --git a/libraries/logic/wonko/WonkoVersionList.h b/libraries/logic/wonko/WonkoVersionList.h
deleted file mode 100644
index 8ea35be6..00000000
--- a/libraries/logic/wonko/WonkoVersionList.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "BaseVersionList.h"
-#include "BaseWonkoEntity.h"
-#include <memory>
-
-using WonkoVersionPtr = std::shared_ptr<class WonkoVersion>;
-using WonkoVersionListPtr = std::shared_ptr<class WonkoVersionList>;
-
-class MULTIMC_LOGIC_EXPORT WonkoVersionList : public BaseVersionList, public BaseWonkoEntity
-{
-	Q_OBJECT
-	Q_PROPERTY(QString uid READ uid CONSTANT)
-	Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-public:
-	explicit WonkoVersionList(const QString &uid, QObject *parent = nullptr);
-
-	enum Roles
-	{
-		UidRole = Qt::UserRole + 100,
-		TimeRole,
-		RequiresRole,
-		WonkoVersionPtrRole
-	};
-
-	Task *getLoadTask() override;
-	bool isLoaded() override;
-	const BaseVersionPtr at(int i) const override;
-	int count() const override;
-	void sortVersions() override;
-
-	BaseVersionPtr getLatestStable() const override;
-	BaseVersionPtr getRecommended() const override;
-
-	QVariant data(const QModelIndex &index, int role) const override;
-	RoleList providesRoles() const override;
-	QHash<int, QByteArray> roleNames() const override;
-
-	std::unique_ptr<Task> remoteUpdateTask() override;
-	std::unique_ptr<Task> localUpdateTask() override;
-
-	QString localFilename() const override;
-	QJsonObject serialized() const override;
-
-	QString uid() const { return m_uid; }
-	QString name() const { return m_name; }
-	QString humanReadable() const;
-
-	bool hasVersion(const QString &version) const;
-	WonkoVersionPtr getVersion(const QString &version) const;
-
-	QVector<WonkoVersionPtr> versions() const { return m_versions; }
-
-public: // for usage only by parsers
-	void setName(const QString &name);
-	void setVersions(const QVector<WonkoVersionPtr> &versions);
-	void merge(const BaseWonkoEntity::Ptr &other);
-
-signals:
-	void nameChanged(const QString &name);
-
-protected slots:
-	void updateListData(QList<BaseVersionPtr> versions) override {}
-
-private:
-	QVector<WonkoVersionPtr> m_versions;
-	QHash<QString, WonkoVersionPtr> m_lookup;
-	QString m_uid;
-	QString m_name;
-
-	WonkoVersionPtr m_recommended;
-	WonkoVersionPtr m_latest;
-
-	void setupAddedVersion(const int row, const WonkoVersionPtr &version);
-};
-
-Q_DECLARE_METATYPE(WonkoVersionListPtr)
diff --git a/libraries/logic/wonko/format/WonkoFormat.cpp b/libraries/logic/wonko/format/WonkoFormat.cpp
deleted file mode 100644
index 11192cbe..00000000
--- a/libraries/logic/wonko/format/WonkoFormat.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoFormat.h"
-
-#include "WonkoFormatV1.h"
-
-#include "wonko/WonkoIndex.h"
-#include "wonko/WonkoVersion.h"
-#include "wonko/WonkoVersionList.h"
-
-static int formatVersion(const QJsonObject &obj)
-{
-	if (!obj.contains("formatVersion")) {
-		throw WonkoParseException(QObject::tr("Missing required field: 'formatVersion'"));
-	}
-	if (!obj.value("formatVersion").isDouble()) {
-		throw WonkoParseException(QObject::tr("Required field has invalid type: 'formatVersion'"));
-	}
-	return obj.value("formatVersion").toInt();
-}
-
-void WonkoFormat::parseIndex(const QJsonObject &obj, WonkoIndex *ptr)
-{
-	const int version = formatVersion(obj);
-	switch (version) {
-	case 1:
-		ptr->merge(WonkoFormatV1().parseIndexInternal(obj));
-		break;
-	default:
-		throw WonkoParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
-	}
-}
-void WonkoFormat::parseVersion(const QJsonObject &obj, WonkoVersion *ptr)
-{
-	const int version = formatVersion(obj);
-	switch (version) {
-	case 1:
-		ptr->merge(WonkoFormatV1().parseVersionInternal(obj));
-		break;
-	default:
-		throw WonkoParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
-	}
-}
-void WonkoFormat::parseVersionList(const QJsonObject &obj, WonkoVersionList *ptr)
-{
-	const int version = formatVersion(obj);
-	switch (version) {
-	case 10:
-		ptr->merge(WonkoFormatV1().parseVersionListInternal(obj));
-		break;
-	default:
-		throw WonkoParseException(QObject::tr("Unknown formatVersion: %1").arg(version));
-	}
-}
-
-QJsonObject WonkoFormat::serializeIndex(const WonkoIndex *ptr)
-{
-	return WonkoFormatV1().serializeIndexInternal(ptr);
-}
-QJsonObject WonkoFormat::serializeVersion(const WonkoVersion *ptr)
-{
-	return WonkoFormatV1().serializeVersionInternal(ptr);
-}
-QJsonObject WonkoFormat::serializeVersionList(const WonkoVersionList *ptr)
-{
-	return WonkoFormatV1().serializeVersionListInternal(ptr);
-}
diff --git a/libraries/logic/wonko/format/WonkoFormat.h b/libraries/logic/wonko/format/WonkoFormat.h
deleted file mode 100644
index 450d6ccc..00000000
--- a/libraries/logic/wonko/format/WonkoFormat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QJsonObject>
-#include <memory>
-
-#include "Exception.h"
-#include "wonko/BaseWonkoEntity.h"
-
-class WonkoIndex;
-class WonkoVersion;
-class WonkoVersionList;
-
-class WonkoParseException : public Exception
-{
-public:
-	using Exception::Exception;
-};
-
-class WonkoFormat
-{
-public:
-	virtual ~WonkoFormat() {}
-
-	static void parseIndex(const QJsonObject &obj, WonkoIndex *ptr);
-	static void parseVersion(const QJsonObject &obj, WonkoVersion *ptr);
-	static void parseVersionList(const QJsonObject &obj, WonkoVersionList *ptr);
-
-	static QJsonObject serializeIndex(const WonkoIndex *ptr);
-	static QJsonObject serializeVersion(const WonkoVersion *ptr);
-	static QJsonObject serializeVersionList(const WonkoVersionList *ptr);
-
-protected:
-	virtual BaseWonkoEntity::Ptr parseIndexInternal(const QJsonObject &obj) const = 0;
-	virtual BaseWonkoEntity::Ptr parseVersionInternal(const QJsonObject &obj) const = 0;
-	virtual BaseWonkoEntity::Ptr parseVersionListInternal(const QJsonObject &obj) const = 0;
-	virtual QJsonObject serializeIndexInternal(const WonkoIndex *ptr) const = 0;
-	virtual QJsonObject serializeVersionInternal(const WonkoVersion *ptr) const = 0;
-	virtual QJsonObject serializeVersionListInternal(const WonkoVersionList *ptr) const = 0;
-};
diff --git a/libraries/logic/wonko/format/WonkoFormatV1.cpp b/libraries/logic/wonko/format/WonkoFormatV1.cpp
deleted file mode 100644
index 363eebfb..00000000
--- a/libraries/logic/wonko/format/WonkoFormatV1.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "WonkoFormatV1.h"
-#include <minecraft/onesix/OneSixVersionFormat.h>
-
-#include "Json.h"
-
-#include "wonko/WonkoIndex.h"
-#include "wonko/WonkoVersion.h"
-#include "wonko/WonkoVersionList.h"
-#include "Env.h"
-
-using namespace Json;
-
-static WonkoVersionPtr parseCommonVersion(const QString &uid, const QJsonObject &obj)
-{
-	const QVector<QJsonObject> requiresRaw = obj.contains("requires") ? requireIsArrayOf<QJsonObject>(obj, "requires") : QVector<QJsonObject>();
-	QVector<WonkoReference> requires;
-	requires.reserve(requiresRaw.size());
-	std::transform(requiresRaw.begin(), requiresRaw.end(), std::back_inserter(requires), [](const QJsonObject &rObj)
-	{
-		WonkoReference ref(requireString(rObj, "uid"));
-		ref.setVersion(ensureString(rObj, "version", QString()));
-		return ref;
-	});
-
-	WonkoVersionPtr version = std::make_shared<WonkoVersion>(uid, requireString(obj, "version"));
-	if (obj.value("time").isString())
-	{
-		version->setTime(QDateTime::fromString(requireString(obj, "time"), Qt::ISODate).toMSecsSinceEpoch() / 1000);
-	}
-	else
-	{
-		version->setTime(requireInteger(obj, "time"));
-	}
-	version->setType(ensureString(obj, "type", QString()));
-	version->setRequires(requires);
-	return version;
-}
-static void serializeCommonVersion(const WonkoVersion *version, QJsonObject &obj)
-{
-	QJsonArray requires;
-	for (const WonkoReference &ref : version->requires())
-	{
-		if (ref.version().isEmpty())
-		{
-			requires.append(QJsonObject({{"uid", ref.uid()}}));
-		}
-		else
-		{
-			requires.append(QJsonObject({
-											{"uid", ref.uid()},
-											{"version", ref.version()}
-										}));
-		}
-	}
-
-	obj.insert("version", version->version());
-	obj.insert("type", version->type());
-	obj.insert("time", version->time().toString(Qt::ISODate));
-	obj.insert("requires", requires);
-}
-
-BaseWonkoEntity::Ptr WonkoFormatV1::parseIndexInternal(const QJsonObject &obj) const
-{
-	const QVector<QJsonObject> objects = requireIsArrayOf<QJsonObject>(obj, "index");
-	QVector<WonkoVersionListPtr> lists;
-	lists.reserve(objects.size());
-	std::transform(objects.begin(), objects.end(), std::back_inserter(lists), [](const QJsonObject &obj)
-	{
-		WonkoVersionListPtr list = std::make_shared<WonkoVersionList>(requireString(obj, "uid"));
-		list->setName(ensureString(obj, "name", QString()));
-		return list;
-	});
-	return std::make_shared<WonkoIndex>(lists);
-}
-BaseWonkoEntity::Ptr WonkoFormatV1::parseVersionInternal(const QJsonObject &obj) const
-{
-	WonkoVersionPtr version = parseCommonVersion(requireString(obj, "uid"), obj);
-
-	version->setData(OneSixVersionFormat::versionFileFromJson(QJsonDocument(obj),
-										   QString("%1/%2.json").arg(version->uid(), version->version()),
-										   obj.contains("order")));
-	return version;
-}
-BaseWonkoEntity::Ptr WonkoFormatV1::parseVersionListInternal(const QJsonObject &obj) const
-{
-	const QString uid = requireString(obj, "uid");
-
-	const QVector<QJsonObject> versionsRaw = requireIsArrayOf<QJsonObject>(obj, "versions");
-	QVector<WonkoVersionPtr> versions;
-	versions.reserve(versionsRaw.size());
-	std::transform(versionsRaw.begin(), versionsRaw.end(), std::back_inserter(versions), [this, uid](const QJsonObject &vObj)
-	{ return parseCommonVersion(uid, vObj); });
-
-	WonkoVersionListPtr list = std::make_shared<WonkoVersionList>(uid);
-	list->setName(ensureString(obj, "name", QString()));
-	list->setVersions(versions);
-	return list;
-}
-
-QJsonObject WonkoFormatV1::serializeIndexInternal(const WonkoIndex *ptr) const
-{
-	QJsonArray index;
-	for (const WonkoVersionListPtr &list : ptr->lists())
-	{
-		index.append(QJsonObject({
-									 {"uid", list->uid()},
-									 {"name", list->name()}
-								 }));
-	}
-	return QJsonObject({
-						   {"formatVersion", 1},
-						   {"index", index}
-					   });
-}
-QJsonObject WonkoFormatV1::serializeVersionInternal(const WonkoVersion *ptr) const
-{
-	QJsonObject obj = OneSixVersionFormat::versionFileToJson(ptr->data(), true).object();
-	serializeCommonVersion(ptr, obj);
-	obj.insert("formatVersion", 1);
-	obj.insert("uid", ptr->uid());
-	// TODO: the name should be looked up in the UI based on the uid
-	obj.insert("name", ENV.wonkoIndex()->getListGuaranteed(ptr->uid())->name());
-
-	return obj;
-}
-QJsonObject WonkoFormatV1::serializeVersionListInternal(const WonkoVersionList *ptr) const
-{
-	QJsonArray versions;
-	for (const WonkoVersionPtr &version : ptr->versions())
-	{
-		QJsonObject obj;
-		serializeCommonVersion(version.get(), obj);
-		versions.append(obj);
-	}
-	return QJsonObject({
-						   {"formatVersion", 10},
-						   {"uid", ptr->uid()},
-						   {"name", ptr->name().isNull() ? QJsonValue() : ptr->name()},
-						   {"versions", versions}
-					   });
-}
diff --git a/libraries/logic/wonko/format/WonkoFormatV1.h b/libraries/logic/wonko/format/WonkoFormatV1.h
deleted file mode 100644
index 92759804..00000000
--- a/libraries/logic/wonko/format/WonkoFormatV1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "WonkoFormat.h"
-
-class WonkoFormatV1 : public WonkoFormat
-{
-public:
-	BaseWonkoEntity::Ptr parseIndexInternal(const QJsonObject &obj) const override;
-	BaseWonkoEntity::Ptr parseVersionInternal(const QJsonObject &obj) const override;
-	BaseWonkoEntity::Ptr parseVersionListInternal(const QJsonObject &obj) const override;
-
-	QJsonObject serializeIndexInternal(const WonkoIndex *ptr) const override;
-	QJsonObject serializeVersionInternal(const WonkoVersion *ptr) const override;
-	QJsonObject serializeVersionListInternal(const WonkoVersionList *ptr) const override;
-};
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp b/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
deleted file mode 100644
index b54c592f..00000000
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseWonkoEntityLocalLoadTask.h"
-
-#include <QFile>
-
-#include "wonko/format/WonkoFormat.h"
-#include "wonko/WonkoUtil.h"
-#include "wonko/WonkoIndex.h"
-#include "wonko/WonkoVersion.h"
-#include "wonko/WonkoVersionList.h"
-#include "Env.h"
-#include "Json.h"
-
-BaseWonkoEntityLocalLoadTask::BaseWonkoEntityLocalLoadTask(BaseWonkoEntity *entity, QObject *parent)
-	: Task(parent), m_entity(entity)
-{
-}
-
-void BaseWonkoEntityLocalLoadTask::executeTask()
-{
-	const QString fname = Wonko::localWonkoDir().absoluteFilePath(filename());
-	if (!QFile::exists(fname))
-	{
-		emitFailed(tr("File doesn't exist"));
-		return;
-	}
-
-	setStatus(tr("Reading %1...").arg(name()));
-	setProgress(0, 0);
-
-	try
-	{
-		parse(Json::requireObject(Json::requireDocument(fname, name()), name()));
-		m_entity->notifyLocalLoadComplete();
-		emitSucceeded();
-	}
-	catch (Exception &e)
-	{
-		emitFailed(tr("Unable to parse file %1: %2").arg(fname, e.cause()));
-	}
-}
-
-//      WONKO INDEX      //
-WonkoIndexLocalLoadTask::WonkoIndexLocalLoadTask(WonkoIndex *index, QObject *parent)
-	: BaseWonkoEntityLocalLoadTask(index, parent)
-{
-}
-QString WonkoIndexLocalLoadTask::filename() const
-{
-	return "index.json";
-}
-QString WonkoIndexLocalLoadTask::name() const
-{
-	return tr("Wonko Index");
-}
-void WonkoIndexLocalLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseIndex(obj, dynamic_cast<WonkoIndex *>(entity()));
-}
-
-//      WONKO VERSION LIST      //
-WonkoVersionListLocalLoadTask::WonkoVersionListLocalLoadTask(WonkoVersionList *list, QObject *parent)
-	: BaseWonkoEntityLocalLoadTask(list, parent)
-{
-}
-QString WonkoVersionListLocalLoadTask::filename() const
-{
-	return list()->uid() + ".json";
-}
-QString WonkoVersionListLocalLoadTask::name() const
-{
-	return tr("Wonko Version List for %1").arg(list()->humanReadable());
-}
-void WonkoVersionListLocalLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseVersionList(obj, list());
-}
-WonkoVersionList *WonkoVersionListLocalLoadTask::list() const
-{
-	return dynamic_cast<WonkoVersionList *>(entity());
-}
-
-//      WONKO VERSION      //
-WonkoVersionLocalLoadTask::WonkoVersionLocalLoadTask(WonkoVersion *version, QObject *parent)
-	: BaseWonkoEntityLocalLoadTask(version, parent)
-{
-}
-QString WonkoVersionLocalLoadTask::filename() const
-{
-	return version()->uid() + "/" + version()->version() + ".json";
-}
-QString WonkoVersionLocalLoadTask::name() const
-{
-	return tr("Wonko Version for %1").arg(version()->name());
-}
-void WonkoVersionLocalLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseVersion(obj, version());
-}
-WonkoVersion *WonkoVersionLocalLoadTask::version() const
-{
-	return dynamic_cast<WonkoVersion *>(entity());
-}
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h b/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
deleted file mode 100644
index 2affa17f..00000000
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "tasks/Task.h"
-#include <memory>
-
-class BaseWonkoEntity;
-class WonkoIndex;
-class WonkoVersionList;
-class WonkoVersion;
-
-class BaseWonkoEntityLocalLoadTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit BaseWonkoEntityLocalLoadTask(BaseWonkoEntity *entity, QObject *parent = nullptr);
-
-protected:
-	virtual QString filename() const = 0;
-	virtual QString name() const = 0;
-	virtual void parse(const QJsonObject &obj) const = 0;
-
-	BaseWonkoEntity *entity() const { return m_entity; }
-
-private:
-	void executeTask() override;
-
-	BaseWonkoEntity *m_entity;
-};
-
-class WonkoIndexLocalLoadTask : public BaseWonkoEntityLocalLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoIndexLocalLoadTask(WonkoIndex *index, QObject *parent = nullptr);
-
-private:
-	QString filename() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-};
-class WonkoVersionListLocalLoadTask : public BaseWonkoEntityLocalLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoVersionListLocalLoadTask(WonkoVersionList *list, QObject *parent = nullptr);
-
-private:
-	QString filename() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-
-	WonkoVersionList *list() const;
-};
-class WonkoVersionLocalLoadTask : public BaseWonkoEntityLocalLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoVersionLocalLoadTask(WonkoVersion *version, QObject *parent = nullptr);
-
-private:
-	QString filename() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-
-	WonkoVersion *version() const;
-};
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp b/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
deleted file mode 100644
index 727ec89d..00000000
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BaseWonkoEntityRemoteLoadTask.h"
-
-#include "net/CacheDownload.h"
-#include "net/HttpMetaCache.h"
-#include "net/NetJob.h"
-#include "wonko/format/WonkoFormat.h"
-#include "wonko/WonkoUtil.h"
-#include "wonko/WonkoIndex.h"
-#include "wonko/WonkoVersion.h"
-#include "wonko/WonkoVersionList.h"
-#include "Env.h"
-#include "Json.h"
-
-BaseWonkoEntityRemoteLoadTask::BaseWonkoEntityRemoteLoadTask(BaseWonkoEntity *entity, QObject *parent)
-	: Task(parent), m_entity(entity)
-{
-}
-
-void BaseWonkoEntityRemoteLoadTask::executeTask()
-{
-	NetJob *job = new NetJob(name());
-
-	auto entry = ENV.metacache()->resolveEntry("wonko", url().toString());
-	entry->setStale(true);
-	m_dl = CacheDownload::make(url(), entry);
-	job->addNetAction(m_dl);
-	connect(job, &NetJob::failed, this, &BaseWonkoEntityRemoteLoadTask::emitFailed);
-	connect(job, &NetJob::succeeded, this, &BaseWonkoEntityRemoteLoadTask::networkFinished);
-	connect(job, &NetJob::status, this, &BaseWonkoEntityRemoteLoadTask::setStatus);
-	connect(job, &NetJob::progress, this, &BaseWonkoEntityRemoteLoadTask::setProgress);
-	job->start();
-}
-
-void BaseWonkoEntityRemoteLoadTask::networkFinished()
-{
-	setStatus(tr("Parsing..."));
-	setProgress(0, 0);
-
-	try
-	{
-		parse(Json::requireObject(Json::requireDocument(m_dl->getTargetFilepath(), name()), name()));
-		m_entity->notifyRemoteLoadComplete();
-		emitSucceeded();
-	}
-	catch (Exception &e)
-	{
-		emitFailed(tr("Unable to parse response: %1").arg(e.cause()));
-	}
-}
-
-//      WONKO INDEX      //
-WonkoIndexRemoteLoadTask::WonkoIndexRemoteLoadTask(WonkoIndex *index, QObject *parent)
-	: BaseWonkoEntityRemoteLoadTask(index, parent)
-{
-}
-QUrl WonkoIndexRemoteLoadTask::url() const
-{
-	return Wonko::indexUrl();
-}
-QString WonkoIndexRemoteLoadTask::name() const
-{
-	return tr("Wonko Index");
-}
-void WonkoIndexRemoteLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseIndex(obj, dynamic_cast<WonkoIndex *>(entity()));
-}
-
-//      WONKO VERSION LIST      //
-WonkoVersionListRemoteLoadTask::WonkoVersionListRemoteLoadTask(WonkoVersionList *list, QObject *parent)
-	: BaseWonkoEntityRemoteLoadTask(list, parent)
-{
-}
-QUrl WonkoVersionListRemoteLoadTask::url() const
-{
-	return Wonko::versionListUrl(list()->uid());
-}
-QString WonkoVersionListRemoteLoadTask::name() const
-{
-	return tr("Wonko Version List for %1").arg(list()->humanReadable());
-}
-void WonkoVersionListRemoteLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseVersionList(obj, list());
-}
-WonkoVersionList *WonkoVersionListRemoteLoadTask::list() const
-{
-	return dynamic_cast<WonkoVersionList *>(entity());
-}
-
-//      WONKO VERSION      //
-WonkoVersionRemoteLoadTask::WonkoVersionRemoteLoadTask(WonkoVersion *version, QObject *parent)
-	: BaseWonkoEntityRemoteLoadTask(version, parent)
-{
-}
-QUrl WonkoVersionRemoteLoadTask::url() const
-{
-	return Wonko::versionUrl(version()->uid(), version()->version());
-}
-QString WonkoVersionRemoteLoadTask::name() const
-{
-	return tr("Wonko Version for %1").arg(version()->name());
-}
-void WonkoVersionRemoteLoadTask::parse(const QJsonObject &obj) const
-{
-	WonkoFormat::parseVersion(obj, version());
-}
-WonkoVersion *WonkoVersionRemoteLoadTask::version() const
-{
-	return dynamic_cast<WonkoVersion *>(entity());
-}
diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h b/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
deleted file mode 100644
index 91ed6af0..00000000
--- a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "tasks/Task.h"
-#include <memory>
-
-class BaseWonkoEntity;
-class WonkoIndex;
-class WonkoVersionList;
-class WonkoVersion;
-
-class BaseWonkoEntityRemoteLoadTask : public Task
-{
-	Q_OBJECT
-public:
-	explicit BaseWonkoEntityRemoteLoadTask(BaseWonkoEntity *entity, QObject *parent = nullptr);
-
-protected:
-	virtual QUrl url() const = 0;
-	virtual QString name() const = 0;
-	virtual void parse(const QJsonObject &obj) const = 0;
-
-	BaseWonkoEntity *entity() const { return m_entity; }
-
-private slots:
-	void networkFinished();
-
-private:
-	void executeTask() override;
-
-	BaseWonkoEntity *m_entity;
-	std::shared_ptr<class CacheDownload> m_dl;
-};
-
-class WonkoIndexRemoteLoadTask : public BaseWonkoEntityRemoteLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoIndexRemoteLoadTask(WonkoIndex *index, QObject *parent = nullptr);
-
-private:
-	QUrl url() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-};
-class WonkoVersionListRemoteLoadTask : public BaseWonkoEntityRemoteLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoVersionListRemoteLoadTask(WonkoVersionList *list, QObject *parent = nullptr);
-
-private:
-	QUrl url() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-
-	WonkoVersionList *list() const;
-};
-class WonkoVersionRemoteLoadTask : public BaseWonkoEntityRemoteLoadTask
-{
-	Q_OBJECT
-public:
-	explicit WonkoVersionRemoteLoadTask(WonkoVersion *version, QObject *parent = nullptr);
-
-private:
-	QUrl url() const override;
-	QString name() const override;
-	void parse(const QJsonObject &obj) const override;
-
-	WonkoVersion *version() const;
-};
diff --git a/libraries/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt
new file mode 100644
index 00000000..b060905b
--- /dev/null
+++ b/libraries/pack200/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(unpack200)
+
+option(PACK200_BUILD_BINARY "Build a tiny utility that decompresses pack200 streams" OFF)
+
+# Find ZLIB for quazip
+find_package(ZLIB REQUIRED)
+
+set(PACK200_SRC
+	include/unpack200.h
+	src/bands.cpp
+	src/bands.h
+	src/bytes.cpp
+	src/bytes.h
+	src/coding.cpp
+	src/coding.h
+	src/constants.h
+	src/defines.h
+	src/unpack200.cpp
+	src/unpack.cpp
+	src/unpack.h
+	src/utils.cpp
+	src/utils.h
+	src/zip.cpp
+	src/zip.h
+)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+add_library(unpack200 STATIC ${PACK200_SRC})
+target_include_directories(unpack200 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" PRIVATE ${ZLIB_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/src")
+
+target_link_libraries(unpack200 ${ZLIB_LIBRARIES})
+
+if(PACK200_BUILD_BINARY)
+	add_executable(anti200 anti200.cpp)
+	target_link_libraries(anti200 unpack200)
+endif()
diff --git a/libraries/pack200/LICENSE b/libraries/pack200/LICENSE
new file mode 100644
index 00000000..b40a0f45
--- /dev/null
+++ b/libraries/pack200/LICENSE
@@ -0,0 +1,347 @@
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
diff --git a/libraries/pack200/anti200.cpp b/libraries/pack200/anti200.cpp
new file mode 100644
index 00000000..1e1ec0c8
--- /dev/null
+++ b/libraries/pack200/anti200.cpp
@@ -0,0 +1,43 @@
+/*
+ * This is trivial. Do what thou wilt with it. Public domain.
+ */
+
+#include <stdexcept>
+#include <iostream>
+#include "unpack200.h"
+
+int main(int argc, char **argv)
+{
+	if (argc != 3)
+	{
+		std::cerr << "Simple pack200 unpacker!" << std::endl << "Run like this:" << std::endl
+				  << "  " << argv[0] << " input.jar.lzma output.jar" << std::endl;
+		return EXIT_FAILURE;
+	}
+
+	FILE *input = fopen(argv[1], "rb");
+	FILE *output = fopen(argv[2], "wb");
+	if (!input)
+	{
+		std::cerr << "Can't open input file";
+		return EXIT_FAILURE;
+	}
+	if (!output)
+	{
+		fclose(output);
+		std::cerr << "Can't open output file";
+		return EXIT_FAILURE;
+	}
+	try
+	{
+		unpack_200(input, output);
+	}
+	catch (std::runtime_error &e)
+	{
+		std::cerr << "Bad things happened: " << e.what() << std::endl;
+		fclose(input);
+		fclose(output);
+		return EXIT_FAILURE;
+	}
+	return EXIT_SUCCESS;
+}
diff --git a/libraries/pack200/include/unpack200.h b/libraries/pack200/include/unpack200.h
new file mode 100644
index 00000000..9c3eda2d
--- /dev/null
+++ b/libraries/pack200/include/unpack200.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#pragma once
+#include <string>
+
+/**
+ * @brief Unpack a PACK200 file
+ *
+ * @param input_path Path to the input file in PACK200 format. System native string encoding.
+ * @param output_path Path to the output file in PACK200 format. System native string encoding.
+ * @throw std::runtime_error for any error encountered
+ */
+void unpack_200(FILE * input_path, FILE * output_path);
diff --git a/libraries/pack200/src/bands.cpp b/libraries/pack200/src/bands.cpp
new file mode 100644
index 00000000..1608d838
--- /dev/null
+++ b/libraries/pack200/src/bands.cpp
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// -*- C++ -*-
+// Small program for unpacking specially compressed Java packages.
+// John R. Rose
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <stdint.h>
+
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+#include "coding.h"
+#include "bands.h"
+
+#include "constants.h"
+#include "unpack.h"
+
+void band::readData(int expectedLength)
+{
+	assert(expectedLength >= 0);
+	assert(vs[0].cmk == cmk_ERROR);
+	if (expectedLength != 0)
+	{
+		assert(length == 0);
+		length = expectedLength;
+	}
+	if (length == 0)
+	{
+		assert((rplimit = cm.vs0.rp = u->rp) != nullptr);
+		return;
+	}
+	assert(length > 0);
+
+	bool is_BYTE1 = (defc->spec == BYTE1_spec);
+
+	if (is_BYTE1)
+	{
+		// No possibility of coding change.  Sizing is exact.
+		u->ensure_input(length);
+	}
+	else
+	{
+		// Make a conservatively generous estimate of band size in bytes.
+		// Assume B == 5 everywhere.
+		// Assume awkward pop with all {U} values (2*5 per value)
+		int64_t generous = (int64_t)length * (B_MAX * 3 + 1) + C_SLOP;
+		u->ensure_input(generous);
+	}
+
+	// Read one value to see what it might be.
+	int XB = _meta_default;
+	if (!is_BYTE1)
+	{
+		// must be a variable-length coding
+		assert(defc->B() > 1 && defc->L() > 0);
+
+		value_stream xvs;
+		coding *valc = defc;
+		if (valc->D() != 0)
+		{
+			valc = coding::findBySpec(defc->B(), defc->H(), defc->S());
+			assert(!valc->isMalloc);
+		}
+		xvs.init(u->rp, u->rplimit, valc);
+		int X = xvs.getInt();
+		if (valc->S() != 0)
+		{
+			assert(valc->min <= -256);
+			XB = -1 - X;
+		}
+		else
+		{
+			int L = valc->L();
+			assert(valc->max >= L + 255);
+			XB = X - L;
+		}
+		if (0 <= XB && XB < 256)
+		{
+			// Skip over the escape value.
+			u->rp = xvs.rp;
+		}
+		else
+		{
+			// No, it's still default.
+			XB = _meta_default;
+		}
+	}
+
+	if (XB <= _meta_canon_max)
+	{
+		byte XB_byte = (byte)XB;
+		byte *XB_ptr = &XB_byte;
+		cm.init(u->rp, u->rplimit, XB_ptr, 0, defc, length, nullptr);
+	}
+	else
+	{
+		assert(u->meta_rp != nullptr);
+		// Scribble the initial byte onto the band.
+		byte *save_meta_rp = --u->meta_rp;
+		byte save_meta_xb = (*save_meta_rp);
+		(*save_meta_rp) = (byte)XB;
+		cm.init(u->rp, u->rplimit, u->meta_rp, 0, defc, length, nullptr);
+		(*save_meta_rp) = save_meta_xb; // put it back, just to be tidy
+	}
+	rplimit = u->rp;
+
+	rewind();
+}
+
+void band::setIndex(cpindex *ix_)
+{
+	assert(ix_ == nullptr || ixTag == ix_->ixTag);
+	ix = ix_;
+}
+void band::setIndexByTag(byte tag)
+{
+	setIndex(u->cp.getIndex(tag));
+}
+
+entry *band::getRefCommon(cpindex *ix_, bool nullOKwithCaller)
+{
+	assert(ix_->ixTag == ixTag ||
+		   (ixTag == CONSTANT_Literal && ix_->ixTag >= CONSTANT_Integer &&
+			ix_->ixTag <= CONSTANT_String));
+	int n = vs[0].getInt() - nullOK;
+	// Note: band-local nullOK means nullptr encodes as 0.
+	// But nullOKwithCaller means caller is willing to tolerate a nullptr.
+	entry *ref = ix_->get(n);
+	if (ref == nullptr && !(nullOKwithCaller && n == -1))
+		unpack_abort(n == -1 ? "nullptr ref" : "bad ref");
+	return ref;
+}
+
+int64_t band::getLong(band &lo_band, bool have_hi)
+{
+	band &hi_band = (*this);
+	assert(lo_band.bn == hi_band.bn + 1);
+	uint32_t lo = lo_band.getInt();
+	if (!have_hi)
+	{
+		assert(hi_band.length == 0);
+		return makeLong(0, lo);
+	}
+	uint32_t hi = hi_band.getInt();
+	return makeLong(hi, lo);
+}
+
+int band::getIntTotal()
+{
+	if (length == 0)
+		return 0;
+	if (total_memo > 0)
+		return total_memo - 1;
+	int total = getInt();
+	// overflow checks require that none of the addends are <0,
+	// and that the partial sums never overflow (wrap negative)
+	if (total < 0)
+	{
+		unpack_abort("overflow detected");
+	}
+	for (int k = length - 1; k > 0; k--)
+	{
+		int prev_total = total;
+		total += vs[0].getInt();
+		if (total < prev_total)
+		{
+			unpack_abort("overflow detected");
+		}
+	}
+	rewind();
+	total_memo = total + 1;
+	return total;
+}
+
+int band::getIntCount(int tag)
+{
+	if (length == 0)
+		return 0;
+	if (tag >= HIST0_MIN && tag <= HIST0_MAX)
+	{
+		if (hist0 == nullptr)
+		{
+			// Lazily calculate an approximate histogram.
+			hist0 = U_NEW(int, (HIST0_MAX - HIST0_MIN) + 1);
+			for (int k = length; k > 0; k--)
+			{
+				int x = vs[0].getInt();
+				if (x >= HIST0_MIN && x <= HIST0_MAX)
+					hist0[x - HIST0_MIN] += 1;
+			}
+			rewind();
+		}
+		return hist0[tag - HIST0_MIN];
+	}
+	int total = 0;
+	for (int k = length; k > 0; k--)
+	{
+		total += (vs[0].getInt() == tag) ? 1 : 0;
+	}
+	rewind();
+	return total;
+}
+
+#define INDEX_INIT(tag, nullOK, subindex) ((tag) + (subindex) * SUBINDEX_BIT + (nullOK) * 256)
+
+#define INDEX(tag) INDEX_INIT(tag, 0, 0)
+#define NULL_OR_INDEX(tag) INDEX_INIT(tag, 1, 0)
+#define SUB_INDEX(tag) INDEX_INIT(tag, 0, 1)
+#define NO_INDEX 0
+
+struct band_init
+{
+	int defc;
+	int index;
+};
+
+#define BAND_INIT(name, cspec, ix)                                                             \
+	{                                                                                          \
+		cspec, ix                                                                              \
+	}
+
+const band_init all_band_inits[] =
+	{
+		// BAND_INIT(archive_magic, BYTE1_spec, 0),
+		// BAND_INIT(archive_header, UNSIGNED5_spec, 0),
+		// BAND_INIT(band_headers, BYTE1_spec, 0),
+		BAND_INIT(cp_Utf8_prefix, DELTA5_spec, 0), BAND_INIT(cp_Utf8_suffix, UNSIGNED5_spec, 0),
+		BAND_INIT(cp_Utf8_chars, CHAR3_spec, 0), BAND_INIT(cp_Utf8_big_suffix, DELTA5_spec, 0),
+		BAND_INIT(cp_Utf8_big_chars, DELTA5_spec, 0), BAND_INIT(cp_Int, UDELTA5_spec, 0),
+		BAND_INIT(cp_Float, UDELTA5_spec, 0), BAND_INIT(cp_Long_hi, UDELTA5_spec, 0),
+		BAND_INIT(cp_Long_lo, DELTA5_spec, 0), BAND_INIT(cp_Double_hi, UDELTA5_spec, 0),
+		BAND_INIT(cp_Double_lo, DELTA5_spec, 0),
+		BAND_INIT(cp_String, UDELTA5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(cp_Class, UDELTA5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(cp_Signature_form, DELTA5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(cp_Signature_classes, UDELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(cp_Descr_name, DELTA5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(cp_Descr_type, UDELTA5_spec, INDEX(CONSTANT_Signature)),
+		BAND_INIT(cp_Field_class, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(cp_Field_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
+		BAND_INIT(cp_Method_class, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(cp_Method_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
+		BAND_INIT(cp_Imethod_class, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(cp_Imethod_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
+		BAND_INIT(attr_definition_headers, BYTE1_spec, 0),
+		BAND_INIT(attr_definition_name, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(attr_definition_layout, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(ic_this_class, UDELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(ic_flags, UNSIGNED5_spec, 0),
+		BAND_INIT(ic_outer_class, DELTA5_spec, NULL_OR_INDEX(CONSTANT_Class)),
+		BAND_INIT(ic_name, DELTA5_spec, NULL_OR_INDEX(CONSTANT_Utf8)),
+		BAND_INIT(class_this, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(class_super, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(class_interface_count, DELTA5_spec, 0),
+		BAND_INIT(class_interface, DELTA5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(class_field_count, DELTA5_spec, 0),
+		BAND_INIT(class_method_count, DELTA5_spec, 0),
+		BAND_INIT(field_descr, DELTA5_spec, INDEX(CONSTANT_NameandType)),
+		BAND_INIT(field_flags_hi, UNSIGNED5_spec, 0),
+		BAND_INIT(field_flags_lo, UNSIGNED5_spec, 0),
+		BAND_INIT(field_attr_count, UNSIGNED5_spec, 0),
+		BAND_INIT(field_attr_indexes, UNSIGNED5_spec, 0),
+		BAND_INIT(field_attr_calls, UNSIGNED5_spec, 0),
+		BAND_INIT(field_ConstantValue_KQ, UNSIGNED5_spec, INDEX(CONSTANT_Literal)),
+		BAND_INIT(field_Signature_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
+		BAND_INIT(field_metadata_bands, -1, -1), BAND_INIT(field_attr_bands, -1, -1),
+		BAND_INIT(method_descr, MDELTA5_spec, INDEX(CONSTANT_NameandType)),
+		BAND_INIT(method_flags_hi, UNSIGNED5_spec, 0),
+		BAND_INIT(method_flags_lo, UNSIGNED5_spec, 0),
+		BAND_INIT(method_attr_count, UNSIGNED5_spec, 0),
+		BAND_INIT(method_attr_indexes, UNSIGNED5_spec, 0),
+		BAND_INIT(method_attr_calls, UNSIGNED5_spec, 0),
+		BAND_INIT(method_Exceptions_N, UNSIGNED5_spec, 0),
+		BAND_INIT(method_Exceptions_RC, UNSIGNED5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(method_Signature_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
+		BAND_INIT(method_metadata_bands, -1, -1), BAND_INIT(method_attr_bands, -1, -1),
+		BAND_INIT(class_flags_hi, UNSIGNED5_spec, 0),
+		BAND_INIT(class_flags_lo, UNSIGNED5_spec, 0),
+		BAND_INIT(class_attr_count, UNSIGNED5_spec, 0),
+		BAND_INIT(class_attr_indexes, UNSIGNED5_spec, 0),
+		BAND_INIT(class_attr_calls, UNSIGNED5_spec, 0),
+		BAND_INIT(class_SourceFile_RUN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Utf8)),
+		BAND_INIT(class_EnclosingMethod_RC, UNSIGNED5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(class_EnclosingMethod_RDN, UNSIGNED5_spec,
+				  NULL_OR_INDEX(CONSTANT_NameandType)),
+		BAND_INIT(class_Signature_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
+		BAND_INIT(class_metadata_bands, -1, -1),
+		BAND_INIT(class_InnerClasses_N, UNSIGNED5_spec, 0),
+		BAND_INIT(class_InnerClasses_RC, UNSIGNED5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(class_InnerClasses_F, UNSIGNED5_spec, 0),
+		BAND_INIT(class_InnerClasses_outer_RCN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Class)),
+		BAND_INIT(class_InnerClasses_name_RUN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Utf8)),
+		BAND_INIT(class_ClassFile_version_minor_H, UNSIGNED5_spec, 0),
+		BAND_INIT(class_ClassFile_version_major_H, UNSIGNED5_spec, 0),
+		BAND_INIT(class_attr_bands, -1, -1), BAND_INIT(code_headers, BYTE1_spec, 0),
+		BAND_INIT(code_max_stack, UNSIGNED5_spec, 0),
+		BAND_INIT(code_max_na_locals, UNSIGNED5_spec, 0),
+		BAND_INIT(code_handler_count, UNSIGNED5_spec, 0),
+		BAND_INIT(code_handler_start_P, BCI5_spec, 0),
+		BAND_INIT(code_handler_end_PO, BRANCH5_spec, 0),
+		BAND_INIT(code_handler_catch_PO, BRANCH5_spec, 0),
+		BAND_INIT(code_handler_class_RCN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Class)),
+		BAND_INIT(code_flags_hi, UNSIGNED5_spec, 0),
+		BAND_INIT(code_flags_lo, UNSIGNED5_spec, 0),
+		BAND_INIT(code_attr_count, UNSIGNED5_spec, 0),
+		BAND_INIT(code_attr_indexes, UNSIGNED5_spec, 0),
+		BAND_INIT(code_attr_calls, UNSIGNED5_spec, 0),
+		BAND_INIT(code_StackMapTable_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_StackMapTable_frame_T, BYTE1_spec, 0),
+		BAND_INIT(code_StackMapTable_local_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_StackMapTable_stack_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_StackMapTable_offset, UNSIGNED5_spec, 0),
+		BAND_INIT(code_StackMapTable_T, BYTE1_spec, 0),
+		BAND_INIT(code_StackMapTable_RC, UNSIGNED5_spec, INDEX(CONSTANT_Class)),
+		BAND_INIT(code_StackMapTable_P, BCI5_spec, 0),
+		BAND_INIT(code_LineNumberTable_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_LineNumberTable_bci_P, BCI5_spec, 0),
+		BAND_INIT(code_LineNumberTable_line, UNSIGNED5_spec, 0),
+		BAND_INIT(code_LocalVariableTable_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_LocalVariableTable_bci_P, BCI5_spec, 0),
+		BAND_INIT(code_LocalVariableTable_span_O, BRANCH5_spec, 0),
+		BAND_INIT(code_LocalVariableTable_name_RU, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(code_LocalVariableTable_type_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
+		BAND_INIT(code_LocalVariableTable_slot, UNSIGNED5_spec, 0),
+		BAND_INIT(code_LocalVariableTypeTable_N, UNSIGNED5_spec, 0),
+		BAND_INIT(code_LocalVariableTypeTable_bci_P, BCI5_spec, 0),
+		BAND_INIT(code_LocalVariableTypeTable_span_O, BRANCH5_spec, 0),
+		BAND_INIT(code_LocalVariableTypeTable_name_RU, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(code_LocalVariableTypeTable_type_RS, UNSIGNED5_spec,
+				  INDEX(CONSTANT_Signature)),
+		BAND_INIT(code_LocalVariableTypeTable_slot, UNSIGNED5_spec, 0),
+		BAND_INIT(code_attr_bands, -1, -1), BAND_INIT(bc_codes, BYTE1_spec, 0),
+		BAND_INIT(bc_case_count, UNSIGNED5_spec, 0), BAND_INIT(bc_case_value, DELTA5_spec, 0),
+		BAND_INIT(bc_byte, BYTE1_spec, 0), BAND_INIT(bc_short, DELTA5_spec, 0),
+		BAND_INIT(bc_local, UNSIGNED5_spec, 0), BAND_INIT(bc_label, BRANCH5_spec, 0),
+		BAND_INIT(bc_intref, DELTA5_spec, INDEX(CONSTANT_Integer)),
+		BAND_INIT(bc_floatref, DELTA5_spec, INDEX(CONSTANT_Float)),
+		BAND_INIT(bc_longref, DELTA5_spec, INDEX(CONSTANT_Long)),
+		BAND_INIT(bc_doubleref, DELTA5_spec, INDEX(CONSTANT_Double)),
+		BAND_INIT(bc_stringref, DELTA5_spec, INDEX(CONSTANT_String)),
+		BAND_INIT(bc_classref, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Class)),
+		BAND_INIT(bc_fieldref, DELTA5_spec, INDEX(CONSTANT_Fieldref)),
+		BAND_INIT(bc_methodref, UNSIGNED5_spec, INDEX(CONSTANT_Methodref)),
+		BAND_INIT(bc_imethodref, DELTA5_spec, INDEX(CONSTANT_InterfaceMethodref)),
+		BAND_INIT(bc_thisfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
+		BAND_INIT(bc_superfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
+		BAND_INIT(bc_thismethod, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Methodref)),
+		BAND_INIT(bc_supermethod, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Methodref)),
+		BAND_INIT(bc_initref, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Methodref)),
+		BAND_INIT(bc_escref, UNSIGNED5_spec, INDEX(CONSTANT_All)),
+		BAND_INIT(bc_escrefsize, UNSIGNED5_spec, 0), BAND_INIT(bc_escsize, UNSIGNED5_spec, 0),
+		BAND_INIT(bc_escbyte, BYTE1_spec, 0),
+		BAND_INIT(file_name, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
+		BAND_INIT(file_size_hi, UNSIGNED5_spec, 0), BAND_INIT(file_size_lo, UNSIGNED5_spec, 0),
+		BAND_INIT(file_modtime, DELTA5_spec, 0), BAND_INIT(file_options, UNSIGNED5_spec, 0),
+		// BAND_INIT(file_bits, BYTE1_spec, 0),
+		{0, 0}};
+
+band *band::makeBands(unpacker *u)
+{
+	band *tmp_all_bands = U_NEW(band, BAND_LIMIT);
+	for (int i = 0; i < BAND_LIMIT; i++)
+	{
+		assert((byte *)&all_band_inits[i + 1] <
+			   (byte *)all_band_inits + sizeof(all_band_inits));
+		const band_init &bi = all_band_inits[i];
+		band &b = tmp_all_bands[i];
+		coding *defc = coding::findBySpec(bi.defc);
+		assert((defc == nullptr) == (bi.defc == -1)); // no garbage, please
+		assert(defc == nullptr || !defc->isMalloc);
+		b.init(u, i, defc);
+		if (bi.index > 0)
+		{
+			b.nullOK = ((bi.index >> 8) & 1);
+			b.ixTag = (bi.index & 0xFF);
+		}
+	}
+	return tmp_all_bands;
+}
+
+void band::initIndexes(unpacker *u)
+{
+	band *tmp_all_bands = u->all_bands;
+	for (int i = 0; i < BAND_LIMIT; i++)
+	{
+		band *scan = &tmp_all_bands[i];
+		uint32_t tag = scan->ixTag; // Cf. #define INDEX(tag) above
+		if (tag != 0 && tag != CONSTANT_Literal && (tag & SUBINDEX_BIT) == 0)
+		{
+			scan->setIndex(u->cp.getIndex(tag));
+		}
+	}
+}
diff --git a/libraries/pack200/src/bands.h b/libraries/pack200/src/bands.h
new file mode 100644
index 00000000..a56cd7d5
--- /dev/null
+++ b/libraries/pack200/src/bands.h
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// -*- C++ -*-
+struct entry;
+struct cpindex;
+struct unpacker;
+
+struct band
+{
+	int bn;	   // band_number of this band
+	coding *defc; // default coding method
+	cpindex *ix;  // CP entry mapping, if CPRefBand
+	byte ixTag;   // 0 or 1; nullptr is coded as (nullOK?0:-1)
+	byte nullOK;  // 0 or 1; nullptr is coded as (nullOK?0:-1)
+	int length;   // expected # values
+	unpacker *u;  // back pointer
+
+	value_stream vs[2]; // source of values
+	coding_method cm;   // method used for initial state of vs[0]
+	byte *rplimit;	  // end of band (encoded, transmitted)
+
+	int total_memo; // cached value of getIntTotal, or -1
+	int *hist0;	 // approximate. histogram
+	enum
+	{
+		HIST0_MIN = 0,
+		HIST0_MAX = 255
+	}; // catches the usual cases
+
+	// properties for attribute layout elements:
+	byte le_kind;   // EK_XXX
+	byte le_bci;	// 0,EK_BCI,EK_BCD,EK_BCO
+	byte le_back;   // ==EF_BACK
+	byte le_len;	// 0,1,2,4 (size in classfile), or call addr
+	band **le_body; // body of repl, union, call (nullptr-terminated)
+// Note:  EK_CASE elements use hist0 to record union tags.
+#define le_casetags hist0
+
+	band &nextBand()
+	{
+		return this[1];
+	}
+	band &prevBand()
+	{
+		return this[-1];
+	}
+
+	void init(unpacker *u_, int bn_, coding *defc_)
+	{
+		u = u_;
+		cm.u = u_;
+		bn = bn_;
+		defc = defc_;
+	}
+	void init(unpacker *u_, int bn_, int defcSpec)
+	{
+		init(u_, bn_, coding::findBySpec(defcSpec));
+	}
+	void initRef(int ixTag_ = 0, bool nullOK_ = false)
+	{
+		ixTag = ixTag_;
+		nullOK = nullOK_;
+		setIndexByTag(ixTag);
+	}
+
+	void expectMoreLength(int l)
+	{
+		assert(length >= 0);		// able to accept a length
+		assert((int)l >= 0);		// no overflow
+		assert(rplimit == nullptr); // readData not yet called
+		length += l;
+		assert(length >= l); // no overflow
+	}
+
+	void setIndex(cpindex *ix_);
+	void setIndexByTag(byte tag);
+
+	// Parse the band and its meta-coding header.
+	void readData(int expectedLength = 0);
+
+	// Reset the band for another pass (Cf. Java Band.resetForSecondPass.)
+	void rewind()
+	{
+		cm.reset(&vs[0]);
+	}
+
+	byte *&curRP()
+	{
+		return vs[0].rp;
+	}
+	byte *minRP()
+	{
+		return cm.vs0.rp;
+	}
+	byte *maxRP()
+	{
+		return rplimit;
+	}
+	size_t size()
+	{
+		return maxRP() - minRP();
+	}
+
+	int getByte()
+	{
+		assert(ix == nullptr);
+		return vs[0].getByte();
+	}
+	int getInt()
+	{
+		assert(ix == nullptr);
+		return vs[0].getInt();
+	}
+	entry *getRefN()
+	{
+		assert(ix != nullptr);
+		return getRefCommon(ix, true);
+	}
+	entry *getRef()
+	{
+		assert(ix != nullptr);
+		return getRefCommon(ix, false);
+	}
+	entry *getRefUsing(cpindex *ix2)
+	{
+		assert(ix == nullptr);
+		return getRefCommon(ix2, true);
+	}
+	entry *getRefCommon(cpindex *ix, bool nullOK);
+	int64_t getLong(band &lo_band, bool have_hi);
+
+	static int64_t makeLong(uint32_t hi, uint32_t lo)
+	{
+		return ((uint64_t)hi << 32) + (((uint64_t)lo << 32) >> 32);
+	}
+
+	int getIntTotal();
+	int getIntCount(int tag);
+
+	static band *makeBands(unpacker *u);
+	static void initIndexes(unpacker *u);
+};
+
+extern band all_bands[];
+
+#define BAND_LOCAL /*                                                                          \
+  band* band_temp = all_bands;                                                                 \
+  band* all_bands = band_temp */
+
+// Band schema:
+enum band_number
+{
+	// e_archive_magic,
+	// e_archive_header,
+	// e_band_headers,
+
+	// constant pool contents
+	e_cp_Utf8_prefix,
+	e_cp_Utf8_suffix,
+	e_cp_Utf8_chars,
+	e_cp_Utf8_big_suffix,
+	e_cp_Utf8_big_chars,
+	e_cp_Int,
+	e_cp_Float,
+	e_cp_Long_hi,
+	e_cp_Long_lo,
+	e_cp_Double_hi,
+	e_cp_Double_lo,
+	e_cp_String,
+	e_cp_Class,
+	e_cp_Signature_form,
+	e_cp_Signature_classes,
+	e_cp_Descr_name,
+	e_cp_Descr_type,
+	e_cp_Field_class,
+	e_cp_Field_desc,
+	e_cp_Method_class,
+	e_cp_Method_desc,
+	e_cp_Imethod_class,
+	e_cp_Imethod_desc,
+
+	// bands which define transmission of attributes
+	e_attr_definition_headers,
+	e_attr_definition_name,
+	e_attr_definition_layout,
+
+	// band for hardwired InnerClasses attribute (shared across the package)
+	e_ic_this_class,
+	e_ic_flags,
+	// These bands contain data only where flags sets ACC_IC_LONG_FORM:
+	e_ic_outer_class,
+	e_ic_name,
+
+	// bands for carrying class schema information:
+	e_class_this,
+	e_class_super,
+	e_class_interface_count,
+	e_class_interface,
+
+	// bands for class members
+	e_class_field_count,
+	e_class_method_count,
+	e_field_descr,
+	e_field_flags_hi,
+	e_field_flags_lo,
+	e_field_attr_count,
+	e_field_attr_indexes,
+	e_field_attr_calls,
+	e_field_ConstantValue_KQ,
+	e_field_Signature_RS,
+	e_field_metadata_bands,
+	e_field_attr_bands,
+	e_method_descr,
+	e_method_flags_hi,
+	e_method_flags_lo,
+	e_method_attr_count,
+	e_method_attr_indexes,
+	e_method_attr_calls,
+	e_method_Exceptions_N,
+	e_method_Exceptions_RC,
+	e_method_Signature_RS,
+	e_method_metadata_bands,
+	e_method_attr_bands,
+	e_class_flags_hi,
+	e_class_flags_lo,
+	e_class_attr_count,
+	e_class_attr_indexes,
+	e_class_attr_calls,
+	e_class_SourceFile_RUN,
+	e_class_EnclosingMethod_RC,
+	e_class_EnclosingMethod_RDN,
+	e_class_Signature_RS,
+	e_class_metadata_bands,
+	e_class_InnerClasses_N,
+	e_class_InnerClasses_RC,
+	e_class_InnerClasses_F,
+	e_class_InnerClasses_outer_RCN,
+	e_class_InnerClasses_name_RUN,
+	e_class_ClassFile_version_minor_H,
+	e_class_ClassFile_version_major_H,
+	e_class_attr_bands,
+	e_code_headers,
+	e_code_max_stack,
+	e_code_max_na_locals,
+	e_code_handler_count,
+	e_code_handler_start_P,
+	e_code_handler_end_PO,
+	e_code_handler_catch_PO,
+	e_code_handler_class_RCN,
+
+	// code attributes
+	e_code_flags_hi,
+	e_code_flags_lo,
+	e_code_attr_count,
+	e_code_attr_indexes,
+	e_code_attr_calls,
+	e_code_StackMapTable_N,
+	e_code_StackMapTable_frame_T,
+	e_code_StackMapTable_local_N,
+	e_code_StackMapTable_stack_N,
+	e_code_StackMapTable_offset,
+	e_code_StackMapTable_T,
+	e_code_StackMapTable_RC,
+	e_code_StackMapTable_P,
+	e_code_LineNumberTable_N,
+	e_code_LineNumberTable_bci_P,
+	e_code_LineNumberTable_line,
+	e_code_LocalVariableTable_N,
+	e_code_LocalVariableTable_bci_P,
+	e_code_LocalVariableTable_span_O,
+	e_code_LocalVariableTable_name_RU,
+	e_code_LocalVariableTable_type_RS,
+	e_code_LocalVariableTable_slot,
+	e_code_LocalVariableTypeTable_N,
+	e_code_LocalVariableTypeTable_bci_P,
+	e_code_LocalVariableTypeTable_span_O,
+	e_code_LocalVariableTypeTable_name_RU,
+	e_code_LocalVariableTypeTable_type_RS,
+	e_code_LocalVariableTypeTable_slot,
+	e_code_attr_bands,
+
+	// bands for bytecodes
+	e_bc_codes,
+	// remaining bands provide typed opcode fields required by the bc_codes
+	e_bc_case_count,
+	e_bc_case_value,
+	e_bc_byte,
+	e_bc_short,
+	e_bc_local,
+	e_bc_label,
+
+	// ldc* operands:
+	e_bc_intref,
+	e_bc_floatref,
+	e_bc_longref,
+	e_bc_doubleref,
+	e_bc_stringref,
+	e_bc_classref,
+	e_bc_fieldref,
+	e_bc_methodref,
+	e_bc_imethodref,
+
+	// _self_linker_op family
+	e_bc_thisfield,
+	e_bc_superfield,
+	e_bc_thismethod,
+	e_bc_supermethod,
+
+	// bc_invokeinit family:
+	e_bc_initref,
+
+	// bytecode escape sequences
+	e_bc_escref,
+	e_bc_escrefsize,
+	e_bc_escsize,
+	e_bc_escbyte,
+
+	// file attributes and contents
+	e_file_name,
+	e_file_size_hi,
+	e_file_size_lo,
+	e_file_modtime,
+	e_file_options,
+	// e_file_bits,  // handled specially as an appendix
+	BAND_LIMIT
+};
+
+// Symbolic names for bands, as if in a giant global struct:
+//#define archive_magic all_bands[e_archive_magic]
+//#define archive_header all_bands[e_archive_header]
+//#define band_headers all_bands[e_band_headers]
+#define cp_Utf8_prefix all_bands[e_cp_Utf8_prefix]
+#define cp_Utf8_suffix all_bands[e_cp_Utf8_suffix]
+#define cp_Utf8_chars all_bands[e_cp_Utf8_chars]
+#define cp_Utf8_big_suffix all_bands[e_cp_Utf8_big_suffix]
+#define cp_Utf8_big_chars all_bands[e_cp_Utf8_big_chars]
+#define cp_Int all_bands[e_cp_Int]
+#define cp_Float all_bands[e_cp_Float]
+#define cp_Long_hi all_bands[e_cp_Long_hi]
+#define cp_Long_lo all_bands[e_cp_Long_lo]
+#define cp_Double_hi all_bands[e_cp_Double_hi]
+#define cp_Double_lo all_bands[e_cp_Double_lo]
+#define cp_String all_bands[e_cp_String]
+#define cp_Class all_bands[e_cp_Class]
+#define cp_Signature_form all_bands[e_cp_Signature_form]
+#define cp_Signature_classes all_bands[e_cp_Signature_classes]
+#define cp_Descr_name all_bands[e_cp_Descr_name]
+#define cp_Descr_type all_bands[e_cp_Descr_type]
+#define cp_Field_class all_bands[e_cp_Field_class]
+#define cp_Field_desc all_bands[e_cp_Field_desc]
+#define cp_Method_class all_bands[e_cp_Method_class]
+#define cp_Method_desc all_bands[e_cp_Method_desc]
+#define cp_Imethod_class all_bands[e_cp_Imethod_class]
+#define cp_Imethod_desc all_bands[e_cp_Imethod_desc]
+#define attr_definition_headers all_bands[e_attr_definition_headers]
+#define attr_definition_name all_bands[e_attr_definition_name]
+#define attr_definition_layout all_bands[e_attr_definition_layout]
+#define ic_this_class all_bands[e_ic_this_class]
+#define ic_flags all_bands[e_ic_flags]
+#define ic_outer_class all_bands[e_ic_outer_class]
+#define ic_name all_bands[e_ic_name]
+#define class_this all_bands[e_class_this]
+#define class_super all_bands[e_class_super]
+#define class_interface_count all_bands[e_class_interface_count]
+#define class_interface all_bands[e_class_interface]
+#define class_field_count all_bands[e_class_field_count]
+#define class_method_count all_bands[e_class_method_count]
+#define field_descr all_bands[e_field_descr]
+#define field_flags_hi all_bands[e_field_flags_hi]
+#define field_flags_lo all_bands[e_field_flags_lo]
+#define field_attr_count all_bands[e_field_attr_count]
+#define field_attr_indexes all_bands[e_field_attr_indexes]
+#define field_ConstantValue_KQ all_bands[e_field_ConstantValue_KQ]
+#define field_Signature_RS all_bands[e_field_Signature_RS]
+#define field_attr_bands all_bands[e_field_attr_bands]
+#define method_descr all_bands[e_method_descr]
+#define method_flags_hi all_bands[e_method_flags_hi]
+#define method_flags_lo all_bands[e_method_flags_lo]
+#define method_attr_count all_bands[e_method_attr_count]
+#define method_attr_indexes all_bands[e_method_attr_indexes]
+#define method_Exceptions_N all_bands[e_method_Exceptions_N]
+#define method_Exceptions_RC all_bands[e_method_Exceptions_RC]
+#define method_Signature_RS all_bands[e_method_Signature_RS]
+#define method_attr_bands all_bands[e_method_attr_bands]
+#define class_flags_hi all_bands[e_class_flags_hi]
+#define class_flags_lo all_bands[e_class_flags_lo]
+#define class_attr_count all_bands[e_class_attr_count]
+#define class_attr_indexes all_bands[e_class_attr_indexes]
+#define class_SourceFile_RUN all_bands[e_class_SourceFile_RUN]
+#define class_EnclosingMethod_RC all_bands[e_class_EnclosingMethod_RC]
+#define class_EnclosingMethod_RDN all_bands[e_class_EnclosingMethod_RDN]
+#define class_Signature_RS all_bands[e_class_Signature_RS]
+#define class_InnerClasses_N all_bands[e_class_InnerClasses_N]
+#define class_InnerClasses_RC all_bands[e_class_InnerClasses_RC]
+#define class_InnerClasses_F all_bands[e_class_InnerClasses_F]
+#define class_InnerClasses_outer_RCN all_bands[e_class_InnerClasses_outer_RCN]
+#define class_InnerClasses_name_RUN all_bands[e_class_InnerClasses_name_RUN]
+#define class_ClassFile_version_minor_H all_bands[e_class_ClassFile_version_minor_H]
+#define class_ClassFile_version_major_H all_bands[e_class_ClassFile_version_major_H]
+#define class_attr_bands all_bands[e_class_attr_bands]
+#define code_headers all_bands[e_code_headers]
+#define code_max_stack all_bands[e_code_max_stack]
+#define code_max_na_locals all_bands[e_code_max_na_locals]
+#define code_handler_count all_bands[e_code_handler_count]
+#define code_handler_start_P all_bands[e_code_handler_start_P]
+#define code_handler_end_PO all_bands[e_code_handler_end_PO]
+#define code_handler_catch_PO all_bands[e_code_handler_catch_PO]
+#define code_handler_class_RCN all_bands[e_code_handler_class_RCN]
+#define code_flags_hi all_bands[e_code_flags_hi]
+#define code_flags_lo all_bands[e_code_flags_lo]
+#define code_attr_count all_bands[e_code_attr_count]
+#define code_attr_indexes all_bands[e_code_attr_indexes]
+#define code_StackMapTable_N all_bands[e_code_StackMapTable_N]
+#define code_StackMapTable_frame_T all_bands[e_code_StackMapTable_frame_T]
+#define code_StackMapTable_local_N all_bands[e_code_StackMapTable_local_N]
+#define code_StackMapTable_stack_N all_bands[e_code_StackMapTable_stack_N]
+#define code_StackMapTable_offset all_bands[e_code_StackMapTable_offset]
+#define code_StackMapTable_T all_bands[e_code_StackMapTable_T]
+#define code_StackMapTable_RC all_bands[e_code_StackMapTable_RC]
+#define code_StackMapTable_P all_bands[e_code_StackMapTable_P]
+#define code_LineNumberTable_N all_bands[e_code_LineNumberTable_N]
+#define code_LineNumberTable_bci_P all_bands[e_code_LineNumberTable_bci_P]
+#define code_LineNumberTable_line all_bands[e_code_LineNumberTable_line]
+#define code_LocalVariableTable_N all_bands[e_code_LocalVariableTable_N]
+#define code_LocalVariableTable_bci_P all_bands[e_code_LocalVariableTable_bci_P]
+#define code_LocalVariableTable_span_O all_bands[e_code_LocalVariableTable_span_O]
+#define code_LocalVariableTable_name_RU all_bands[e_code_LocalVariableTable_name_RU]
+#define code_LocalVariableTable_type_RS all_bands[e_code_LocalVariableTable_type_RS]
+#define code_LocalVariableTable_slot all_bands[e_code_LocalVariableTable_slot]
+#define code_LocalVariableTypeTable_N all_bands[e_code_LocalVariableTypeTable_N]
+#define code_LocalVariableTypeTable_bci_P all_bands[e_code_LocalVariableTypeTable_bci_P]
+#define code_LocalVariableTypeTable_span_O all_bands[e_code_LocalVariableTypeTable_span_O]
+#define code_LocalVariableTypeTable_name_RU all_bands[e_code_LocalVariableTypeTable_name_RU]
+#define code_LocalVariableTypeTable_type_RS all_bands[e_code_LocalVariableTypeTable_type_RS]
+#define code_LocalVariableTypeTable_slot all_bands[e_code_LocalVariableTypeTable_slot]
+#define code_attr_bands all_bands[e_code_attr_bands]
+#define bc_codes all_bands[e_bc_codes]
+#define bc_case_count all_bands[e_bc_case_count]
+#define bc_case_value all_bands[e_bc_case_value]
+#define bc_byte all_bands[e_bc_byte]
+#define bc_short all_bands[e_bc_short]
+#define bc_local all_bands[e_bc_local]
+#define bc_label all_bands[e_bc_label]
+#define bc_intref all_bands[e_bc_intref]
+#define bc_floatref all_bands[e_bc_floatref]
+#define bc_longref all_bands[e_bc_longref]
+#define bc_doubleref all_bands[e_bc_doubleref]
+#define bc_stringref all_bands[e_bc_stringref]
+#define bc_classref all_bands[e_bc_classref]
+#define bc_fieldref all_bands[e_bc_fieldref]
+#define bc_methodref all_bands[e_bc_methodref]
+#define bc_imethodref all_bands[e_bc_imethodref]
+#define bc_thisfield all_bands[e_bc_thisfield]
+#define bc_superfield all_bands[e_bc_superfield]
+#define bc_thismethod all_bands[e_bc_thismethod]
+#define bc_supermethod all_bands[e_bc_supermethod]
+#define bc_initref all_bands[e_bc_initref]
+#define bc_escref all_bands[e_bc_escref]
+#define bc_escrefsize all_bands[e_bc_escrefsize]
+#define bc_escsize all_bands[e_bc_escsize]
+#define bc_escbyte all_bands[e_bc_escbyte]
+#define file_name all_bands[e_file_name]
+#define file_size_hi all_bands[e_file_size_hi]
+#define file_size_lo all_bands[e_file_size_lo]
+#define file_modtime all_bands[e_file_modtime]
+#define file_options all_bands[e_file_options]
diff --git a/libraries/pack200/src/bytes.cpp b/libraries/pack200/src/bytes.cpp
new file mode 100644
index 00000000..d3808afa
--- /dev/null
+++ b/libraries/pack200/src/bytes.cpp
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdint.h>
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+
+static byte dummy[1 << 10];
+
+bool bytes::inBounds(const void *p)
+{
+	return p >= ptr && p < limit();
+}
+
+void bytes::malloc(size_t len_)
+{
+	len = len_;
+	ptr = NEW(byte, add_size(len_, 1)); // add trailing zero byte always
+	if (ptr == nullptr)
+	{
+		// set ptr to some victim memory, to ease escape
+		set(dummy, sizeof(dummy) - 1);
+		unpack_abort(ERROR_ENOMEM);
+	}
+}
+
+void bytes::realloc(size_t len_)
+{
+	if (len == len_)
+		return; // nothing to do
+	if (ptr == dummy)
+		return; // escaping from an error
+	if (ptr == nullptr)
+	{
+		malloc(len_);
+		return;
+	}
+	byte *oldptr = ptr;
+	ptr = (len_ >= PSIZE_MAX) ? nullptr : (byte *)::realloc(ptr, add_size(len_, 1));
+	if (ptr != nullptr)
+	{
+		if (len < len_)
+			memset(ptr + len, 0, len_ - len);
+		ptr[len_] = 0;
+		len = len_;
+	}
+	else
+	{
+		ptr = oldptr; // ease our escape
+		unpack_abort(ERROR_ENOMEM);
+	}
+}
+
+void bytes::free()
+{
+	if (ptr == dummy)
+		return; // escaping from an error
+	if (ptr != nullptr)
+	{
+		::free(ptr);
+	}
+	len = 0;
+	ptr = 0;
+}
+
+int bytes::indexOf(byte c)
+{
+	byte *p = (byte *)memchr(ptr, c, len);
+	return (p == 0) ? -1 : (int)(p - ptr);
+}
+
+byte *bytes::writeTo(byte *bp)
+{
+	memcpy(bp, ptr, len);
+	return bp + len;
+}
+
+int bytes::compareTo(bytes &other)
+{
+	size_t l1 = len;
+	size_t l2 = other.len;
+	int cmp = memcmp(ptr, other.ptr, (l1 < l2) ? l1 : l2);
+	if (cmp != 0)
+		return cmp;
+	return (l1 < l2) ? -1 : (l1 > l2) ? 1 : 0;
+}
+
+void bytes::saveFrom(const void *ptr_, size_t len_)
+{
+	malloc(len_);
+	// Save as much as possible.
+	if (len_ > len)
+	{
+		assert(ptr == dummy); // error recovery
+		len_ = len;
+	}
+	copyFrom(ptr_, len_);
+}
+
+//#TODO: Need to fix for exception handling
+void bytes::copyFrom(const void *ptr_, size_t len_, size_t offset)
+{
+	assert(len_ == 0 || inBounds(ptr + offset));
+	assert(len_ == 0 || inBounds(ptr + offset + len_ - 1));
+	memcpy(ptr + offset, ptr_, len_);
+}
+
+// Make sure there are 'o' bytes beyond the fill pointer,
+// advance the fill pointer, and return the old fill pointer.
+byte *fillbytes::grow(size_t s)
+{
+	size_t nlen = add_size(b.len, s);
+	if (nlen <= allocated)
+	{
+		b.len = nlen;
+		return limit() - s;
+	}
+	size_t maxlen = nlen;
+	if (maxlen < 128)
+		maxlen = 128;
+	if (maxlen < allocated * 2)
+		maxlen = allocated * 2;
+	if (allocated == 0)
+	{
+		// Initial buffer was not malloced.  Do not reallocate it.
+		bytes old = b;
+		b.malloc(maxlen);
+		if (b.len == maxlen)
+			old.writeTo(b.ptr);
+	}
+	else
+	{
+		b.realloc(maxlen);
+	}
+	allocated = b.len;
+	if (allocated != maxlen)
+	{
+		b.len = nlen - s; // back up
+		return dummy;	 // scribble during error recov.
+	}
+	// after realloc, recompute pointers
+	b.len = nlen;
+	assert(b.len <= allocated);
+	return limit() - s;
+}
+
+void fillbytes::ensureSize(size_t s)
+{
+	if (allocated >= s)
+		return;
+	size_t len0 = b.len;
+	grow(s - size());
+	b.len = len0; // put it back
+}
+
+int ptrlist::indexOf(const void *x)
+{
+	int len = length();
+	for (int i = 0; i < len; i++)
+	{
+		if (get(i) == x)
+			return i;
+	}
+	return -1;
+}
+
+void ptrlist::freeAll()
+{
+	int len = length();
+	for (int i = 0; i < len; i++)
+	{
+		void *p = (void *)get(i);
+		if (p != nullptr)
+		{
+			::free(p);
+		}
+	}
+	free();
+}
+
+int intlist::indexOf(int x)
+{
+	int len = length();
+	for (int i = 0; i < len; i++)
+	{
+		if (get(i) == x)
+			return i;
+	}
+	return -1;
+}
diff --git a/libraries/pack200/src/bytes.h b/libraries/pack200/src/bytes.h
new file mode 100644
index 00000000..b116efda
--- /dev/null
+++ b/libraries/pack200/src/bytes.h
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#pragma once
+
+struct bytes
+{
+	int8_t *ptr;
+	size_t len;
+	int8_t *limit()
+	{
+		return ptr + len;
+	}
+
+	void set(int8_t *ptr_, size_t len_)
+	{
+		ptr = ptr_;
+		len = len_;
+	}
+	void set(const char *str)
+	{
+		ptr = (int8_t *)str;
+		len = strlen(str);
+	}
+	bool inBounds(const void *p); // p in [ptr, limit)
+	void malloc(size_t len_);
+	void realloc(size_t len_);
+	void free();
+	void copyFrom(const void *ptr_, size_t len_, size_t offset = 0);
+	void saveFrom(const void *ptr_, size_t len_);
+	void saveFrom(const char *str)
+	{
+		saveFrom(str, strlen(str));
+	}
+	void copyFrom(bytes &other, size_t offset = 0)
+	{
+		copyFrom(other.ptr, other.len, offset);
+	}
+	void saveFrom(bytes &other)
+	{
+		saveFrom(other.ptr, other.len);
+	}
+	void clear(int fill_byte = 0)
+	{
+		memset(ptr, fill_byte, len);
+	}
+	int8_t *writeTo(int8_t *bp);
+	bool equals(bytes &other)
+	{
+		return 0 == compareTo(other);
+	}
+	int compareTo(bytes &other);
+	bool contains(int8_t c)
+	{
+		return indexOf(c) >= 0;
+	}
+	int indexOf(int8_t c);
+	// substrings:
+	static bytes of(int8_t *ptr, size_t len)
+	{
+		bytes res;
+		res.set(ptr, len);
+		return res;
+	}
+	bytes slice(size_t beg, size_t end)
+	{
+		bytes res;
+		res.ptr = ptr + beg;
+		res.len = end - beg;
+		assert(res.len == 0 ||(inBounds(res.ptr) && inBounds(res.limit() - 1)));
+		return res;
+	}
+	// building C strings inside byte buffers:
+	bytes &strcat(const char *str)
+	{
+		::strcat((char *)ptr, str);
+		return *this;
+	}
+	bytes &strcat(bytes &other)
+	{
+		::strncat((char *)ptr, (char *)other.ptr, other.len);
+		return *this;
+	}
+	char *strval()
+	{
+		assert(strlen((char *)ptr) == len);
+		return (char *)ptr;
+	}
+};
+#define BYTES_OF(var) (bytes::of((int8_t *)&(var), sizeof(var)))
+
+struct fillbytes
+{
+	bytes b;
+	size_t allocated;
+
+	int8_t *base()
+	{
+		return b.ptr;
+	}
+	size_t size()
+	{
+		return b.len;
+	}
+	int8_t *limit()
+	{
+		return b.limit();
+	} // logical limit
+	void setLimit(int8_t *lp)
+	{
+		assert(isAllocated(lp));
+		b.len = lp - b.ptr;
+	}
+	int8_t *end()
+	{
+		return b.ptr + allocated;
+	} // physical limit
+	int8_t *loc(size_t o)
+	{
+		assert(o < b.len);
+		return b.ptr + o;
+	}
+	void init()
+	{
+		allocated = 0;
+		b.set(nullptr, 0);
+	}
+	void init(size_t s)
+	{
+		init();
+		ensureSize(s);
+	}
+	void free()
+	{
+		if (allocated != 0)
+			b.free();
+		allocated = 0;
+	}
+	void empty()
+	{
+		b.len = 0;
+	}
+	int8_t *grow(size_t s); // grow so that limit() += s
+	int getByte(uint32_t i)
+	{
+		return *loc(i) & 0xFF;
+	}
+	void addByte(int8_t x)
+	{
+		*grow(1) = x;
+	}
+	void ensureSize(size_t s); // make sure allocated >= s
+	void trimToSize()
+	{
+		if (allocated > size())
+			b.realloc(allocated = size());
+	}
+	bool canAppend(size_t s)
+	{
+		return allocated > b.len + s;
+	}
+	bool isAllocated(int8_t *p)
+	{
+		return p >= base() && p <= end();
+	} // asserts
+	void set(bytes &src)
+	{
+		set(src.ptr, src.len);
+	}
+
+	void set(int8_t *ptr, size_t len)
+	{
+		b.set(ptr, len);
+		allocated = 0; // mark as not reallocatable
+	}
+
+	// block operations on resizing byte buffer:
+	fillbytes &append(const void *ptr_, size_t len_)
+	{
+		memcpy(grow(len_), ptr_, len_);
+		return (*this);
+	}
+	fillbytes &append(bytes &other)
+	{
+		return append(other.ptr, other.len);
+	}
+	fillbytes &append(const char *str)
+	{
+		return append(str, strlen(str));
+	}
+};
+
+struct ptrlist : fillbytes
+{
+	typedef const void *cvptr;
+	int length()
+	{
+		return (int)(size() / sizeof(cvptr));
+	}
+	cvptr *base()
+	{
+		return (cvptr *)fillbytes::base();
+	}
+	cvptr &get(int i)
+	{
+		return *(cvptr *)loc(i * sizeof(cvptr));
+	}
+	cvptr *limit()
+	{
+		return (cvptr *)fillbytes::limit();
+	}
+	void add(cvptr x)
+	{
+		*(cvptr *)grow(sizeof(x)) = x;
+	}
+	void popTo(int l)
+	{
+		assert(l <= length());
+		b.len = l * sizeof(cvptr);
+	}
+	int indexOf(cvptr x);
+	bool contains(cvptr x)
+	{
+		return indexOf(x) >= 0;
+	}
+	void freeAll(); // frees every ptr on the list, plus the list itself
+};
+// Use a macro rather than mess with subtle mismatches
+// between member and non-member function pointers.
+#define PTRLIST_QSORT(ptrls, fn) ::qsort((ptrls).base(), (ptrls).length(), sizeof(void *), fn)
+
+struct intlist : fillbytes
+{
+	int length()
+	{
+		return (int)(size() / sizeof(int));
+	}
+	int *base()
+	{
+		return (int *)fillbytes::base();
+	}
+	int &get(int i)
+	{
+		return *(int *)loc(i * sizeof(int));
+	}
+	int *limit()
+	{
+		return (int *)fillbytes::limit();
+	}
+	void add(int x)
+	{
+		*(int *)grow(sizeof(x)) = x;
+	}
+	void popTo(int l)
+	{
+		assert(l <= length());
+		b.len = l * sizeof(int);
+	}
+	int indexOf(int x);
+	bool contains(int x)
+	{
+		return indexOf(x) >= 0;
+	}
+};
diff --git a/libraries/pack200/src/coding.cpp b/libraries/pack200/src/coding.cpp
new file mode 100644
index 00000000..6bd17a3c
--- /dev/null
+++ b/libraries/pack200/src/coding.cpp
@@ -0,0 +1,1044 @@
+/*
+ * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// -*- C++ -*-
+// Small program for unpacking specially compressed Java packages.
+// John R. Rose
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <stdint.h>
+
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+#include "coding.h"
+
+#include "constants.h"
+#include "unpack.h"
+
+extern coding basic_codings[];
+
+// CODING_PRIVATE causes a lot of them
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
+#define CODING_PRIVATE(spec)                                                                   \
+	int spec_ = spec;                                                                          \
+	int B = CODING_B(spec_);                                                                   \
+	int H = CODING_H(spec_);                                                                   \
+	int L = 256 - H;                                                                           \
+	int S = CODING_S(spec_);                                                                   \
+	int D = CODING_D(spec_)
+
+#define IS_NEG_CODE(S, codeVal) ((((int)(codeVal) + 1) & ((1 << S) - 1)) == 0)
+
+#define DECODE_SIGN_S1(ux) (((uint32_t)(ux) >> 1) ^ -((int)(ux) & 1))
+
+static int decode_sign(int S, uint32_t ux)
+{ // == Coding.decodeSign32
+	assert(S > 0);
+	uint32_t sigbits = (ux >> S);
+	if (IS_NEG_CODE(S, ux))
+		return (int)(~sigbits);
+	else
+		return (int)(ux - sigbits);
+	// Note that (int)(ux-sigbits) can be negative, if ux is large enough.
+}
+
+coding *coding::init()
+{
+	if (umax > 0)
+		return this;   // already done
+	assert(spec != 0); // sanity
+
+	// fill in derived fields
+	CODING_PRIVATE(spec);
+
+	// Return nullptr if 'arb(BHSD)' parameter constraints are not met:
+	if (B < 1 || B > B_MAX)
+		return nullptr;
+	if (H < 1 || H > 256)
+		return nullptr;
+	if (S < 0 || S > 2)
+		return nullptr;
+	if (D < 0 || D > 1)
+		return nullptr;
+	if (B == 1 && H != 256)
+		return nullptr; // 1-byte coding must be fixed-size
+	if (B >= 5 && H == 256)
+		return nullptr; // no 5-byte fixed-size coding
+
+	// first compute the range of the coding, in 64 bits
+	int64_t range = 0;
+	{
+		int64_t H_i = 1;
+		for (int i = 0; i < B; i++)
+		{
+			range += H_i;
+			H_i *= H;
+		}
+		range *= L;
+		range += H_i;
+	}
+	assert(range > 0); // no useless codings, please
+
+	int this_umax;
+
+	// now, compute min and max
+	if (range >= ((int64_t)1 << 32))
+	{
+		this_umax = INT_MAX_VALUE;
+		this->umin = INT_MIN_VALUE;
+		this->max = INT_MAX_VALUE;
+		this->min = INT_MIN_VALUE;
+	}
+	else
+	{
+		this_umax = (range > INT_MAX_VALUE) ? INT_MAX_VALUE : (int)range - 1;
+		this->max = this_umax;
+		this->min = this->umin = 0;
+		if (S != 0 && range != 0)
+		{
+			int64_t maxPosCode = range - 1;
+			int64_t maxNegCode = range - 1;
+			while (IS_NEG_CODE(S, maxPosCode))
+				--maxPosCode;
+			while (!IS_NEG_CODE(S, maxNegCode))
+				--maxNegCode;
+			int maxPos = decode_sign(S, (uint32_t)maxPosCode);
+			if (maxPos < 0)
+				this->max = INT_MAX_VALUE; // 32-bit wraparound
+			else
+				this->max = maxPos;
+			if (maxNegCode < 0)
+				this->min = 0; // No negative codings at all.
+			else
+				this->min = decode_sign(S, (uint32_t)maxNegCode);
+		}
+	}
+
+	assert(!(isFullRange | isSigned | isSubrange)); // init
+	if (min < 0)
+		this->isSigned = true;
+	if (max < INT_MAX_VALUE && range <= INT_MAX_VALUE)
+		this->isSubrange = true;
+	if (max == INT_MAX_VALUE && min == INT_MIN_VALUE)
+		this->isFullRange = true;
+
+	// do this last, to reduce MT exposure (should have a membar too)
+	this->umax = this_umax;
+
+	return this;
+}
+
+coding *coding::findBySpec(int spec)
+{
+	for (coding *scan = &basic_codings[0];; scan++)
+	{
+		if (scan->spec == spec)
+			return scan->init();
+		if (scan->spec == 0)
+			break;
+	}
+	coding *ptr = NEW(coding, 1);
+	if (!ptr)
+		return nullptr;
+	coding *c = ptr->initFrom(spec);
+	if (c == nullptr)
+	{
+		::free(ptr);
+	}
+	else
+		// else caller should free it...
+		c->isMalloc = true;
+	return c;
+}
+
+coding *coding::findBySpec(int B, int H, int S, int D)
+{
+	if (B < 1 || B > B_MAX)
+		return nullptr;
+	if (H < 1 || H > 256)
+		return nullptr;
+	if (S < 0 || S > 2)
+		return nullptr;
+	if (D < 0 || D > 1)
+		return nullptr;
+	return findBySpec(CODING_SPEC(B, H, S, D));
+}
+
+void coding::free()
+{
+	if (isMalloc)
+	{
+		::free(this);
+	}
+}
+
+void coding_method::reset(value_stream *state)
+{
+	assert(state->rp == state->rplimit); // not in mid-stream, please
+	// assert(this == vs0.cm);
+	state[0] = vs0;
+	if (uValues != nullptr)
+	{
+		uValues->reset(state->helper());
+	}
+}
+
+uint32_t coding::parse(byte *&rp, int B, int H)
+{
+	int L = 256 - H;
+	byte *ptr = rp;
+	// hand peel the i==0 part of the loop:
+	uint32_t b_i = *ptr++ & 0xFF;
+	if (B == 1 || b_i < (uint32_t)L)
+	{
+		rp = ptr;
+		return b_i;
+	}
+	uint32_t sum = b_i;
+	uint32_t H_i = H;
+	assert(B <= B_MAX);
+	for (int i = 2; i <= B_MAX; i++)
+	{ // easy for compilers to unroll if desired
+		b_i = *ptr++ & 0xFF;
+		sum += b_i * H_i;
+		if (i == B || b_i < (uint32_t)L)
+		{
+			rp = ptr;
+			return sum;
+		}
+		H_i *= H;
+	}
+	assert(false);
+	return 0;
+}
+
+uint32_t coding::parse_lgH(byte *&rp, int B, int H, int lgH)
+{
+	assert(H == (1 << lgH));
+	int L = 256 - (1 << lgH);
+	byte *ptr = rp;
+	// hand peel the i==0 part of the loop:
+	uint32_t b_i = *ptr++ & 0xFF;
+	if (B == 1 || b_i < (uint32_t)L)
+	{
+		rp = ptr;
+		return b_i;
+	}
+	uint32_t sum = b_i;
+	uint32_t lg_H_i = lgH;
+	assert(B <= B_MAX);
+	for (int i = 2; i <= B_MAX; i++)
+	{ // easy for compilers to unroll if desired
+		b_i = *ptr++ & 0xFF;
+		sum += b_i << lg_H_i;
+		if (i == B || b_i < (uint32_t)L)
+		{
+			rp = ptr;
+			return sum;
+		}
+		lg_H_i += lgH;
+	}
+	assert(false);
+	return 0;
+}
+
+static const char ERB[] = "EOF reading band";
+
+void coding::parseMultiple(byte *&rp, int N, byte *limit, int B, int H)
+{
+	if (N < 0)
+	{
+		unpack_abort("bad value count");
+		return;
+	}
+	byte *ptr = rp;
+	if (B == 1 || H == 256)
+	{
+		size_t len = (size_t)N * B;
+		if (len / B != (size_t)N || ptr + len > limit)
+		{
+			unpack_abort(ERB);
+			return;
+		}
+		rp = ptr + len;
+		return;
+	}
+	// Note:  We assume rp has enough zero-padding.
+	int L = 256 - H;
+	int n = B;
+	while (N > 0)
+	{
+		ptr += 1;
+		if (--n == 0)
+		{
+			// end of encoding at B bytes, regardless of byte value
+		}
+		else
+		{
+			int b = (ptr[-1] & 0xFF);
+			if (b >= L)
+			{
+				// keep going, unless we find a byte < L
+				continue;
+			}
+		}
+		// found the last byte
+		N -= 1;
+		n = B; // reset length counter
+		// do an error check here
+		if (ptr > limit)
+		{
+			unpack_abort(ERB);
+			return;
+		}
+	}
+	rp = ptr;
+	return;
+}
+
+bool value_stream::hasHelper()
+{
+	// If my coding method is a pop-style method,
+	// then I need a second value stream to transmit
+	// unfavored values.
+	// This can be determined by examining fValues.
+	return cm->fValues != nullptr;
+}
+
+void value_stream::init(byte *rp_, byte *rplimit_, coding *defc)
+{
+	rp = rp_;
+	rplimit = rplimit_;
+	sum = 0;
+	cm = nullptr; // no need in the simple case
+	setCoding(defc);
+}
+
+void value_stream::setCoding(coding *defc)
+{
+	if (defc == nullptr)
+	{
+		unpack_abort("bad coding");
+		defc = coding::findByIndex(_meta_canon_min); // random pick for recovery
+	}
+
+	c = (*defc);
+
+	// choose cmk
+	cmk = cmk_ERROR;
+	switch (c.spec)
+	{
+	case BYTE1_spec:
+		cmk = cmk_BYTE1;
+		break;
+	case CHAR3_spec:
+		cmk = cmk_CHAR3;
+		break;
+	case UNSIGNED5_spec:
+		cmk = cmk_UNSIGNED5;
+		break;
+	case DELTA5_spec:
+		cmk = cmk_DELTA5;
+		break;
+	case BCI5_spec:
+		cmk = cmk_BCI5;
+		break;
+	case BRANCH5_spec:
+		cmk = cmk_BRANCH5;
+		break;
+	default:
+		if (c.D() == 0)
+		{
+			switch (c.S())
+			{
+			case 0:
+				cmk = cmk_BHS0;
+				break;
+			case 1:
+				cmk = cmk_BHS1;
+				break;
+			default:
+				cmk = cmk_BHS;
+				break;
+			}
+		}
+		else
+		{
+			if (c.S() == 1)
+			{
+				if (c.isFullRange)
+					cmk = cmk_BHS1D1full;
+				if (c.isSubrange)
+					cmk = cmk_BHS1D1sub;
+			}
+			if (cmk == cmk_ERROR)
+				cmk = cmk_BHSD1;
+		}
+	}
+}
+
+static int getPopValue(value_stream *self, uint32_t uval)
+{
+	if (uval > 0)
+	{
+		// note that the initial parse performed a range check
+		assert(uval <= (uint32_t)self->cm->fVlength);
+		return self->cm->fValues[uval - 1];
+	}
+	else
+	{
+		// take an unfavored value
+		return self->helper()->getInt();
+	}
+}
+
+int coding::sumInUnsignedRange(int x, int y)
+{
+	assert(isSubrange);
+	int range = (int)(umax + 1);
+	assert(range > 0);
+	x += y;
+	if (x != (int)((int64_t)(x - y) + (int64_t)y))
+	{
+		// 32-bit overflow interferes with range reduction.
+		// Back off from the overflow by adding a multiple of range:
+		if (x < 0)
+		{
+			x -= range;
+			assert(x >= 0);
+		}
+		else
+		{
+			x += range;
+			assert(x < 0);
+		}
+	}
+	if (x < 0)
+	{
+		x += range;
+		if (x >= 0)
+			return x;
+	}
+	else if (x >= range)
+	{
+		x -= range;
+		if (x < range)
+			return x;
+	}
+	else
+	{
+		// in range
+		return x;
+	}
+	// do it the hard way
+	x %= range;
+	if (x < 0)
+		x += range;
+	return x;
+}
+
+static int getDeltaValue(value_stream *self, uint32_t uval, bool isSubrange)
+{
+	assert((uint32_t)(self->c.isSubrange) == (uint32_t)isSubrange);
+	assert(self->c.isSubrange | self->c.isFullRange);
+	if (isSubrange)
+		return self->sum = self->c.sumInUnsignedRange(self->sum, (int)uval);
+	else
+		return self->sum += (int)uval;
+}
+
+bool value_stream::hasValue()
+{
+	if (rp < rplimit)
+		return true;
+	if (cm == nullptr)
+		return false;
+	if (cm->next == nullptr)
+		return false;
+	cm->next->reset(this);
+	return hasValue();
+}
+
+int value_stream::getInt()
+{
+	if (rp >= rplimit)
+	{
+		// Advance to next coding segment.
+		if (rp > rplimit || cm == nullptr || cm->next == nullptr)
+		{
+			// Must perform this check and throw an exception on bad input.
+			unpack_abort(ERB);
+			return 0;
+		}
+		cm->next->reset(this);
+		return getInt();
+	}
+
+	CODING_PRIVATE(c.spec);
+	uint32_t uval;
+	enum
+	{
+		B5 = 5,
+		B3 = 3,
+		H128 = 128,
+		H64 = 64,
+		H4 = 4
+	};
+	switch (cmk)
+	{
+	case cmk_BHS:
+		assert(D == 0);
+		uval = coding::parse(rp, B, H);
+		if (S == 0)
+			return (int)uval;
+		return decode_sign(S, uval);
+
+	case cmk_BHS0:
+		assert(S == 0 && D == 0);
+		uval = coding::parse(rp, B, H);
+		return (int)uval;
+
+	case cmk_BHS1:
+		assert(S == 1 && D == 0);
+		uval = coding::parse(rp, B, H);
+		return DECODE_SIGN_S1(uval);
+
+	case cmk_BYTE1:
+		assert(c.spec == BYTE1_spec);
+		assert(B == 1 && H == 256 && S == 0 && D == 0);
+		return *rp++ & 0xFF;
+
+	case cmk_CHAR3:
+		assert(c.spec == CHAR3_spec);
+		assert(B == B3 && H == H128 && S == 0 && D == 0);
+		return coding::parse_lgH(rp, B3, H128, 7);
+
+	case cmk_UNSIGNED5:
+		assert(c.spec == UNSIGNED5_spec);
+		assert(B == B5 && H == H64 && S == 0 && D == 0);
+		return coding::parse_lgH(rp, B5, H64, 6);
+
+	case cmk_BHSD1:
+		assert(D == 1);
+		uval = coding::parse(rp, B, H);
+		if (S != 0)
+			uval = (uint32_t)decode_sign(S, uval);
+		return getDeltaValue(this, uval, (bool)c.isSubrange);
+
+	case cmk_BHS1D1full:
+		assert(S == 1 && D == 1 && c.isFullRange);
+		uval = coding::parse(rp, B, H);
+		uval = (uint32_t)DECODE_SIGN_S1(uval);
+		return getDeltaValue(this, uval, false);
+
+	case cmk_BHS1D1sub:
+		assert(S == 1 && D == 1 && c.isSubrange);
+		uval = coding::parse(rp, B, H);
+		uval = (uint32_t)DECODE_SIGN_S1(uval);
+		return getDeltaValue(this, uval, true);
+
+	case cmk_DELTA5:
+		assert(c.spec == DELTA5_spec);
+		assert(B == B5 && H == H64 && S == 1 && D == 1 && c.isFullRange);
+		uval = coding::parse_lgH(rp, B5, H64, 6);
+		sum += DECODE_SIGN_S1(uval);
+		return sum;
+
+	case cmk_BCI5:
+		assert(c.spec == BCI5_spec);
+		assert(B == B5 && H == H4 && S == 0 && D == 0);
+		return coding::parse_lgH(rp, B5, H4, 2);
+
+	case cmk_BRANCH5:
+		assert(c.spec == BRANCH5_spec);
+		assert(B == B5 && H == H4 && S == 2 && D == 0);
+		uval = coding::parse_lgH(rp, B5, H4, 2);
+		return decode_sign(S, uval);
+
+	case cmk_pop:
+		uval = coding::parse(rp, B, H);
+		if (S != 0)
+		{
+			uval = (uint32_t)decode_sign(S, uval);
+		}
+		if (D != 0)
+		{
+			assert(c.isSubrange | c.isFullRange);
+			if (c.isSubrange)
+				sum = c.sumInUnsignedRange(sum, (int)uval);
+			else
+				sum += (int)uval;
+			uval = (uint32_t)sum;
+		}
+		return getPopValue(this, uval);
+
+	case cmk_pop_BHS0:
+		assert(S == 0 && D == 0);
+		uval = coding::parse(rp, B, H);
+		return getPopValue(this, uval);
+
+	case cmk_pop_BYTE1:
+		assert(c.spec == BYTE1_spec);
+		assert(B == 1 && H == 256 && S == 0 && D == 0);
+		return getPopValue(this, *rp++ & 0xFF);
+
+	default:
+		break;
+	}
+	assert(false);
+	return 0;
+}
+
+static int moreCentral(int x, int y)
+{ // used to find end of Pop.{F}
+	// Suggested implementation from the Pack200 specification:
+	uint32_t kx = (x >> 31) ^ (x << 1);
+	uint32_t ky = (y >> 31) ^ (y << 1);
+	return (kx < ky ? x : y);
+}
+// static maybe_inline
+// int moreCentral2(int x, int y, int min) {
+//  // Strict implementation of buggy 150.7 specification.
+//  // The bug is that the spec. says absolute-value ties are broken
+//  // in favor of positive numbers, but the suggested implementation
+//  // (also mentioned in the spec.) breaks ties in favor of negative numbers.
+//  if ((x + y) != 0)
+//    return min;
+//  else
+//    // return the other value, which breaks a tie in the positive direction
+//    return (x > y)? x: y;
+//}
+
+static const byte *no_meta[] = {nullptr};
+#define NO_META (*(byte **)no_meta)
+enum
+{
+	POP_FAVORED_N = -2
+};
+
+// mode bits
+#define DISABLE_RUN 1 // used immediately inside ACodee
+#define DISABLE_POP 2 // used recursively in all pop sub-bands
+
+// This function knows all about meta-coding.
+void coding_method::init(byte *&band_rp, byte *band_limit, byte *&meta_rp, int mode,
+						 coding *defc, int N, intlist *valueSink)
+{
+	assert(N != 0);
+
+	assert(u != nullptr); // must be pre-initialized
+	// if (u == nullptr)  u = unpacker::current();  // expensive
+
+	int op = (meta_rp == nullptr) ? _meta_default : (*meta_rp++ & 0xFF);
+	coding *foundc = nullptr;
+	coding *to_free = nullptr;
+
+	if (op == _meta_default)
+	{
+		foundc = defc;
+		// and fall through
+	}
+	else if (op >= _meta_canon_min && op <= _meta_canon_max)
+	{
+		foundc = coding::findByIndex(op);
+		// and fall through
+	}
+	else if (op == _meta_arb)
+	{
+		int args = (*meta_rp++ & 0xFF);
+		// args = (D:[0..1] + 2*S[0..2] + 8*(B:[1..5]-1))
+		int D = ((args >> 0) & 1);
+		int S = ((args >> 1) & 3);
+		int B = ((args >> 3) & -1) + 1;
+		// & (H[1..256]-1)
+		int H = (*meta_rp++ & 0xFF) + 1;
+		foundc = coding::findBySpec(B, H, S, D);
+		to_free = foundc; // findBySpec may dynamically allocate
+		if (foundc == nullptr)
+		{
+			unpack_abort("illegal arbitrary coding");
+			return;
+		}
+		// and fall through
+	}
+	else if (op >= _meta_run && op < _meta_pop)
+	{
+		int args = (op - _meta_run);
+		// args: KX:[0..3] + 4*(KBFlag:[0..1]) + 8*(ABDef:[0..2])
+		int KX = ((args >> 0) & 3);
+		int KBFlag = ((args >> 2) & 1);
+		int ABDef = ((args >> 3) & -1);
+		assert(ABDef <= 2);
+		// & KB: one of [0..255] if KBFlag=1
+		int KB = (!KBFlag ? 3 : (*meta_rp++ & 0xFF));
+		int K = (KB + 1) << (KX * 4);
+		int N2 = (N >= 0) ? N - K : N;
+		if (N == 0 || (N2 <= 0 && N2 != N))
+		{
+			unpack_abort("illegal run encoding");
+		}
+		if ((mode & DISABLE_RUN) != 0)
+		{
+			unpack_abort("illegal nested run encoding");
+		}
+
+		// & Enc{ ACode } if ADef=0  (ABDef != 1)
+		// No direct nesting of 'run' in ACode, but in BCode it's OK.
+		int disRun = mode | DISABLE_RUN;
+		if (ABDef == 1)
+		{
+			this->init(band_rp, band_limit, NO_META, disRun, defc, K, valueSink);
+		}
+		else
+		{
+			this->init(band_rp, band_limit, meta_rp, disRun, defc, K, valueSink);
+		}
+
+		// & Enc{ BCode } if BDef=0  (ABDef != 2)
+		coding_method *tail = U_NEW(coding_method, 1);
+		if (!tail)
+			return;
+		tail->u = u;
+
+		// The 'run' codings may be nested indirectly via 'pop' codings.
+		// This means that this->next may already be filled in, if
+		// ACode was of type 'pop' with a 'run' token coding.
+		// No problem:  Just chain the upcoming BCode onto the end.
+		for (coding_method *self = this;; self = self->next)
+		{
+			if (self->next == nullptr)
+			{
+				self->next = tail;
+				break;
+			}
+		}
+
+		if (ABDef == 2)
+		{
+			tail->init(band_rp, band_limit, NO_META, mode, defc, N2, valueSink);
+		}
+		else
+		{
+			tail->init(band_rp, band_limit, meta_rp, mode, defc, N2, valueSink);
+		}
+		// Note:  The preceding calls to init should be tail-recursive.
+
+		return; // done; no falling through
+	}
+	else if (op >= _meta_pop && op < _meta_limit)
+	{
+		int args = (op - _meta_pop);
+		// args: (FDef:[0..1]) + 2*UDef:[0..1] + 4*(TDefL:[0..11])
+		int FDef = ((args >> 0) & 1);
+		int UDef = ((args >> 1) & 1);
+		int TDefL = ((args >> 2) & -1);
+		assert(TDefL <= 11);
+		int TDef = (TDefL > 0);
+		int TL = (TDefL <= 6) ? (2 << TDefL) : (256 - (4 << (11 - TDefL)));
+		int TH = (256 - TL);
+		if (N <= 0)
+		{
+			unpack_abort("illegal pop encoding");
+		}
+		if ((mode & DISABLE_POP) != 0)
+		{
+			unpack_abort("illegal nested pop encoding");
+		}
+
+		// No indirect nesting of 'pop', but 'run' is OK.
+		int disPop = DISABLE_POP;
+
+		// & Enc{ FCode } if FDef=0
+		int FN = POP_FAVORED_N;
+		assert(valueSink == nullptr);
+		intlist fValueSink;
+		fValueSink.init();
+		coding_method fval;
+		BYTES_OF(fval).clear();
+		fval.u = u;
+		if (FDef != 0)
+		{
+			fval.init(band_rp, band_limit, NO_META, disPop, defc, FN, &fValueSink);
+		}
+		else
+		{
+			fval.init(band_rp, band_limit, meta_rp, disPop, defc, FN, &fValueSink);
+		}
+		bytes fvbuf;
+		fValues = (u->saveTo(fvbuf, fValueSink.b), (int *)fvbuf.ptr);
+		fVlength = fValueSink.length(); // i.e., the parameter K
+		fValueSink.free();
+
+		// Skip the first {F} run in all subsequent passes.
+		// The next call to this->init(...) will set vs0.rp to point after the {F}.
+
+		// & Enc{ TCode } if TDef=0  (TDefL==0)
+		if (TDef != 0)
+		{
+			coding *tcode = coding::findBySpec(1, 256); // BYTE1
+			// find the most narrowly sufficient code:
+			for (int B = 2; B <= B_MAX; B++)
+			{
+				if (fVlength <= tcode->umax)
+					break; // found it
+				tcode->free();
+				tcode = coding::findBySpec(B, TH);
+				if (!tcode)
+					return;
+			}
+			if (!(fVlength <= tcode->umax))
+			{
+				unpack_abort("pop.L value too small");
+			}
+			this->init(band_rp, band_limit, NO_META, disPop, tcode, N, nullptr);
+			tcode->free();
+		}
+		else
+		{
+			this->init(band_rp, band_limit, meta_rp, disPop, defc, N, nullptr);
+		}
+
+		// Count the number of zero tokens right now.
+		// Also verify that they are in bounds.
+		int UN = 0; // one {U} for each zero in {T}
+		value_stream vs = vs0;
+		for (int i = 0; i < N; i++)
+		{
+			uint32_t val = vs.getInt();
+			if (val == 0)
+				UN += 1;
+			if (!(val <= (uint32_t)fVlength))
+			{
+				unpack_abort("pop token out of range");
+			}
+		}
+		vs.done();
+
+		// & Enc{ UCode } if UDef=0
+		if (UN != 0)
+		{
+			uValues = U_NEW(coding_method, 1);
+			if (uValues == nullptr)
+				return;
+			uValues->u = u;
+			if (UDef != 0)
+			{
+				uValues->init(band_rp, band_limit, NO_META, disPop, defc, UN, nullptr);
+			}
+			else
+			{
+				uValues->init(band_rp, band_limit, meta_rp, disPop, defc, UN, nullptr);
+			}
+		}
+		else
+		{
+			if (UDef == 0)
+			{
+				int uop = (*meta_rp++ & 0xFF);
+				if (uop > _meta_canon_max)
+					// %%% Spec. requires the more strict (uop != _meta_default).
+					unpack_abort("bad meta-coding for empty pop/U");
+			}
+		}
+
+		// Bug fix for 6259542
+		// Last of all, adjust vs0.cmk to the 'pop' flavor
+		for (coding_method *self = this; self != nullptr; self = self->next)
+		{
+			coding_method_kind cmk2 = cmk_pop;
+			switch (self->vs0.cmk)
+			{
+			case cmk_BHS0:
+				cmk2 = cmk_pop_BHS0;
+				break;
+			case cmk_BYTE1:
+				cmk2 = cmk_pop_BYTE1;
+				break;
+			default:
+				break;
+			}
+			self->vs0.cmk = cmk2;
+			if (self != this)
+			{
+				assert(self->fValues == nullptr); // no double init
+				self->fValues = this->fValues;
+				self->fVlength = this->fVlength;
+				assert(self->uValues == nullptr); // must stay nullptr
+			}
+		}
+
+		return; // done; no falling through
+	}
+	else
+	{
+		unpack_abort("bad meta-coding");
+	}
+
+	// Common code here skips a series of values with one coding.
+	assert(foundc != nullptr);
+
+	assert(vs0.cmk == cmk_ERROR);   // no garbage, please
+	assert(vs0.rp == nullptr);	  // no garbage, please
+	assert(vs0.rplimit == nullptr); // no garbage, please
+	assert(vs0.sum == 0);		   // no garbage, please
+
+	vs0.init(band_rp, band_limit, foundc);
+
+	// Done with foundc.  Free if necessary.
+	if (to_free != nullptr)
+	{
+		to_free->free();
+		to_free = nullptr;
+	}
+	foundc = nullptr;
+
+	coding &c = vs0.c;
+	CODING_PRIVATE(c.spec);
+	// assert sane N
+	assert((uint32_t)N < INT_MAX_VALUE || N == POP_FAVORED_N);
+
+	// Look at the values, or at least skip over them quickly.
+	if (valueSink == nullptr)
+	{
+		// Skip and ignore values in the first pass.
+		c.parseMultiple(band_rp, N, band_limit, B, H);
+	}
+	else if (N >= 0)
+	{
+		// Pop coding, {F} sequence, initial run of values...
+		assert((mode & DISABLE_POP) != 0);
+		value_stream vs = vs0;
+		for (int n = 0; n < N; n++)
+		{
+			int val = vs.getInt();
+			valueSink->add(val);
+		}
+		band_rp = vs.rp;
+	}
+	else
+	{
+		// Pop coding, {F} sequence, final run of values...
+		assert((mode & DISABLE_POP) != 0);
+		assert(N == POP_FAVORED_N);
+		int min = INT_MIN_VALUE; // farthest from the center
+		// min2 is based on the buggy specification of centrality in version 150.7
+		// no known implementations transmit this value, but just in case...
+		// int min2 = INT_MIN_VALUE;
+		int last = 0;
+		// if there were initial runs, find the potential sentinels in them:
+		for (int i = 0; i < valueSink->length(); i++)
+		{
+			last = valueSink->get(i);
+			min = moreCentral(min, last);
+			// min2 = moreCentral2(min2, last, min);
+		}
+		value_stream vs = vs0;
+		for (;;)
+		{
+			int val = vs.getInt();
+			if (valueSink->length() > 0 && (val == last || val == min)) //|| val == min2
+				break;
+			valueSink->add(val);
+			last = val;
+			min = moreCentral(min, last);
+			// min2 = moreCentral2(min2, last, min);
+		}
+		band_rp = vs.rp;
+	}
+
+	// Get an accurate upper limit now.
+	vs0.rplimit = band_rp;
+	vs0.cm = this;
+
+	return; // success
+}
+
+coding basic_codings[] = {
+	// This one is not a usable irregular coding, but is used by cp_Utf8_chars.
+	CODING_INIT(3, 128, 0, 0),
+
+	// Fixed-length codings:
+	CODING_INIT(1, 256, 0, 0), CODING_INIT(1, 256, 1, 0), CODING_INIT(1, 256, 0, 1),
+	CODING_INIT(1, 256, 1, 1), CODING_INIT(2, 256, 0, 0), CODING_INIT(2, 256, 1, 0),
+	CODING_INIT(2, 256, 0, 1), CODING_INIT(2, 256, 1, 1), CODING_INIT(3, 256, 0, 0),
+	CODING_INIT(3, 256, 1, 0), CODING_INIT(3, 256, 0, 1), CODING_INIT(3, 256, 1, 1),
+	CODING_INIT(4, 256, 0, 0), CODING_INIT(4, 256, 1, 0), CODING_INIT(4, 256, 0, 1),
+	CODING_INIT(4, 256, 1, 1),
+
+	// Full-range variable-length codings:
+	CODING_INIT(5, 4, 0, 0),   CODING_INIT(5, 4, 1, 0),   CODING_INIT(5, 4, 2, 0),
+	CODING_INIT(5, 16, 0, 0),  CODING_INIT(5, 16, 1, 0),  CODING_INIT(5, 16, 2, 0),
+	CODING_INIT(5, 32, 0, 0),  CODING_INIT(5, 32, 1, 0),  CODING_INIT(5, 32, 2, 0),
+	CODING_INIT(5, 64, 0, 0),  CODING_INIT(5, 64, 1, 0),  CODING_INIT(5, 64, 2, 0),
+	CODING_INIT(5, 128, 0, 0), CODING_INIT(5, 128, 1, 0), CODING_INIT(5, 128, 2, 0),
+	CODING_INIT(5, 4, 0, 1),   CODING_INIT(5, 4, 1, 1),   CODING_INIT(5, 4, 2, 1),
+	CODING_INIT(5, 16, 0, 1),  CODING_INIT(5, 16, 1, 1),  CODING_INIT(5, 16, 2, 1),
+	CODING_INIT(5, 32, 0, 1),  CODING_INIT(5, 32, 1, 1),  CODING_INIT(5, 32, 2, 1),
+	CODING_INIT(5, 64, 0, 1),  CODING_INIT(5, 64, 1, 1),  CODING_INIT(5, 64, 2, 1),
+	CODING_INIT(5, 128, 0, 1), CODING_INIT(5, 128, 1, 1), CODING_INIT(5, 128, 2, 1),
+
+	// Variable length subrange codings:
+	CODING_INIT(2, 192, 0, 0), CODING_INIT(2, 224, 0, 0), CODING_INIT(2, 240, 0, 0),
+	CODING_INIT(2, 248, 0, 0), CODING_INIT(2, 252, 0, 0), CODING_INIT(2, 8, 0, 1),
+	CODING_INIT(2, 8, 1, 1),   CODING_INIT(2, 16, 0, 1),  CODING_INIT(2, 16, 1, 1),
+	CODING_INIT(2, 32, 0, 1),  CODING_INIT(2, 32, 1, 1),  CODING_INIT(2, 64, 0, 1),
+	CODING_INIT(2, 64, 1, 1),  CODING_INIT(2, 128, 0, 1), CODING_INIT(2, 128, 1, 1),
+	CODING_INIT(2, 192, 0, 1), CODING_INIT(2, 192, 1, 1), CODING_INIT(2, 224, 0, 1),
+	CODING_INIT(2, 224, 1, 1), CODING_INIT(2, 240, 0, 1), CODING_INIT(2, 240, 1, 1),
+	CODING_INIT(2, 248, 0, 1), CODING_INIT(2, 248, 1, 1), CODING_INIT(3, 192, 0, 0),
+	CODING_INIT(3, 224, 0, 0), CODING_INIT(3, 240, 0, 0), CODING_INIT(3, 248, 0, 0),
+	CODING_INIT(3, 252, 0, 0), CODING_INIT(3, 8, 0, 1),   CODING_INIT(3, 8, 1, 1),
+	CODING_INIT(3, 16, 0, 1),  CODING_INIT(3, 16, 1, 1),  CODING_INIT(3, 32, 0, 1),
+	CODING_INIT(3, 32, 1, 1),  CODING_INIT(3, 64, 0, 1),  CODING_INIT(3, 64, 1, 1),
+	CODING_INIT(3, 128, 0, 1), CODING_INIT(3, 128, 1, 1), CODING_INIT(3, 192, 0, 1),
+	CODING_INIT(3, 192, 1, 1), CODING_INIT(3, 224, 0, 1), CODING_INIT(3, 224, 1, 1),
+	CODING_INIT(3, 240, 0, 1), CODING_INIT(3, 240, 1, 1), CODING_INIT(3, 248, 0, 1),
+	CODING_INIT(3, 248, 1, 1), CODING_INIT(4, 192, 0, 0), CODING_INIT(4, 224, 0, 0),
+	CODING_INIT(4, 240, 0, 0), CODING_INIT(4, 248, 0, 0), CODING_INIT(4, 252, 0, 0),
+	CODING_INIT(4, 8, 0, 1),   CODING_INIT(4, 8, 1, 1),   CODING_INIT(4, 16, 0, 1),
+	CODING_INIT(4, 16, 1, 1),  CODING_INIT(4, 32, 0, 1),  CODING_INIT(4, 32, 1, 1),
+	CODING_INIT(4, 64, 0, 1),  CODING_INIT(4, 64, 1, 1),  CODING_INIT(4, 128, 0, 1),
+	CODING_INIT(4, 128, 1, 1), CODING_INIT(4, 192, 0, 1), CODING_INIT(4, 192, 1, 1),
+	CODING_INIT(4, 224, 0, 1), CODING_INIT(4, 224, 1, 1), CODING_INIT(4, 240, 0, 1),
+	CODING_INIT(4, 240, 1, 1), CODING_INIT(4, 248, 0, 1), CODING_INIT(4, 248, 1, 1),
+	CODING_INIT(0, 0, 0, 0)};
+#define BASIC_INDEX_LIMIT (int)(sizeof(basic_codings) / sizeof(basic_codings[0]) - 1)
+
+coding *coding::findByIndex(int idx)
+{
+	int index_limit = BASIC_INDEX_LIMIT;
+	assert(_meta_canon_min == 1 && _meta_canon_max + 1 == index_limit);
+
+	if (idx >= _meta_canon_min && idx <= _meta_canon_max)
+		return basic_codings[idx].init();
+	else
+		return nullptr;
+}
diff --git a/libraries/pack200/src/coding.h b/libraries/pack200/src/coding.h
new file mode 100644
index 00000000..f9bd6ca2
--- /dev/null
+++ b/libraries/pack200/src/coding.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+struct unpacker;
+
+#define INT_MAX_VALUE ((int)0x7FFFFFFF)
+#define INT_MIN_VALUE ((int)0x80000000)
+
+#define CODING_SPEC(B, H, S, D) ((B) << 20 | (H) << 8 | (S) << 4 | (D) << 0)
+#define CODING_B(x) ((x) >> 20 & 0xF)
+#define CODING_H(x) ((x) >> 8 & 0xFFF)
+#define CODING_S(x) ((x) >> 4 & 0xF)
+#define CODING_D(x) ((x) >> 0 & 0xF)
+
+#define CODING_INIT(B, H, S, D)                                                                \
+	{                                                                                          \
+		CODING_SPEC(B, H, S, D), 0, 0, 0, 0, 0, 0, 0, 0                                        \
+	}
+
+// For debugging purposes, some compilers do not like this and will complain.
+//    #define long do_not_use_C_long_types_use_jlong_or_int
+// Use of the type "long" is problematic, do not use it.
+
+struct coding
+{
+	int spec; // B,H,S,D
+
+	// Handy values derived from the spec:
+	int B()
+	{
+		return CODING_B(spec);
+	}
+	int H()
+	{
+		return CODING_H(spec);
+	}
+	int S()
+	{
+		return CODING_S(spec);
+	}
+	int D()
+	{
+		return CODING_D(spec);
+	}
+	int L()
+	{
+		return 256 - CODING_H(spec);
+	}
+	int min, max;
+	int umin, umax;
+	char isSigned, isSubrange, isFullRange, isMalloc;
+
+	coding *init(); // returns self or nullptr if error
+	coding *initFrom(int spec_)
+	{
+		assert(this->spec == 0);
+		this->spec = spec_;
+		return init();
+	}
+
+	static coding *findBySpec(int spec);
+	static coding *findBySpec(int B, int H, int S = 0, int D = 0);
+	static coding *findByIndex(int irregularCodingIndex);
+
+	static uint32_t parse(byte *&rp, int B, int H);
+	static uint32_t parse_lgH(byte *&rp, int B, int H, int lgH);
+	static void parseMultiple(byte *&rp, int N, byte *limit, int B, int H);
+
+	uint32_t parse(byte *&rp)
+	{
+		return parse(rp, CODING_B(spec), CODING_H(spec));
+	}
+	void parseMultiple(byte *&rp, int N, byte *limit)
+	{
+		parseMultiple(rp, N, limit, CODING_B(spec), CODING_H(spec));
+	}
+
+	bool canRepresent(int x)
+	{
+		return (x >= min && x <= max);
+	}
+	bool canRepresentUnsigned(int x)
+	{
+		return (x >= umin && x <= umax);
+	}
+
+	int sumInUnsignedRange(int x, int y);
+
+	int readFrom(byte *&rpVar, int *dbase);
+	void readArrayFrom(byte *&rpVar, int *dbase, int length, int *values);
+	void skipArrayFrom(byte *&rpVar, int length)
+	{
+		readArrayFrom(rpVar, (int *)NULL, length, (int *)NULL);
+	}
+
+	void free(); // free self if isMalloc
+};
+
+enum coding_method_kind
+{
+	cmk_ERROR,
+	cmk_BHS,
+	cmk_BHS0,
+	cmk_BHS1,
+	cmk_BHSD1,
+	cmk_BHS1D1full, // isFullRange
+	cmk_BHS1D1sub,  // isSubRange
+
+	// special cases hand-optimized (~50% of all decoded values)
+	cmk_BYTE1,	 //(1,256)      6%
+	cmk_CHAR3,	 //(3,128)      7%
+	cmk_UNSIGNED5, //(5,64)      13%
+	cmk_DELTA5,	//(5,64,1,1)   5%
+	cmk_BCI5,	  //(5,4)       18%
+	cmk_BRANCH5,   //(5,4,2)      4%
+				   // cmk_UNSIGNED5H16,  //(5,16)       5%
+				   // cmk_UNSIGNED2H4,   //(2,4)        6%
+				   // cmk_DELTA4H8,      //(4,8,1,1)   10%
+	// cmk_DELTA3H16,     //(3,16,1,1)   9%
+	cmk_BHS_LIMIT,
+	cmk_pop,
+	cmk_pop_BHS0,
+	cmk_pop_BYTE1,
+	cmk_pop_LIMIT,
+	cmk_LIMIT
+};
+
+enum
+{
+	BYTE1_spec = CODING_SPEC(1, 256, 0, 0),
+	CHAR3_spec = CODING_SPEC(3, 128, 0, 0),
+	UNSIGNED4_spec = CODING_SPEC(4, 256, 0, 0),
+	UNSIGNED5_spec = CODING_SPEC(5, 64, 0, 0),
+	SIGNED5_spec = CODING_SPEC(5, 64, 1, 0),
+	DELTA5_spec = CODING_SPEC(5, 64, 1, 1),
+	UDELTA5_spec = CODING_SPEC(5, 64, 0, 1),
+	MDELTA5_spec = CODING_SPEC(5, 64, 2, 1),
+	BCI5_spec = CODING_SPEC(5, 4, 0, 0),
+	BRANCH5_spec = CODING_SPEC(5, 4, 2, 0)
+};
+
+enum
+{
+	B_MAX = 5,
+	C_SLOP = B_MAX * 10
+};
+
+struct coding_method;
+
+// iterator under the control of a meta-coding
+struct value_stream
+{
+	// current coding of values or values
+	coding c;			   // B,H,S,D,etc.
+	coding_method_kind cmk; // type of decoding needed
+	byte *rp;			   // read pointer
+	byte *rplimit;		  // final value of read pointer
+	int sum;				// partial sum of all values so far (D=1 only)
+	coding_method *cm;	  // coding method that defines this stream
+
+	void init(byte *band_rp, byte *band_limit, coding *defc);
+	void init(byte *band_rp, byte *band_limit, int spec)
+	{
+		init(band_rp, band_limit, coding::findBySpec(spec));
+	}
+
+	void setCoding(coding *c);
+	void setCoding(int spec)
+	{
+		setCoding(coding::findBySpec(spec));
+	}
+
+	// Parse and decode a single value.
+	int getInt();
+
+	// Parse and decode a single byte, with no error checks.
+	int getByte()
+	{
+		assert(cmk == cmk_BYTE1);
+		assert(rp < rplimit);
+		return *rp++ & 0xFF;
+	}
+
+	// Used only for asserts.
+	bool hasValue();
+
+	void done()
+	{
+		assert(!hasValue());
+	}
+
+	// Sometimes a value stream has an auxiliary (but there are never two).
+	value_stream *helper()
+	{
+		assert(hasHelper());
+		return this + 1;
+	}
+	bool hasHelper();
+};
+
+struct coding_method
+{
+	value_stream vs0; // initial state snapshot (vs.meta==this)
+
+	coding_method *next; // what to do when we run out of bytes
+
+	// these fields are used for pop codes only:
+	int *fValues;		   // favored value array
+	int fVlength;		   // maximum favored value token
+	coding_method *uValues; // unfavored value stream
+
+	// pointer to outer unpacker, for error checks etc.
+	unpacker *u;
+
+	// Initialize a value stream.
+	void reset(value_stream *state);
+
+	// Parse a band header, size a band, and initialize for further action.
+	// band_rp advances (but not past band_limit), and meta_rp advances.
+	// The mode gives context, such as "inside a pop".
+	// The defc and N are the incoming parameters to a meta-coding.
+	// The value sink is used to collect output values, when desired.
+	void init(byte *&band_rp, byte *band_limit, byte *&meta_rp, int mode, coding *defc, int N,
+			  intlist *valueSink);
+};
diff --git a/libraries/pack200/src/constants.h b/libraries/pack200/src/constants.h
new file mode 100644
index 00000000..2cc14b7d
--- /dev/null
+++ b/libraries/pack200/src/constants.h
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  Java Class Version numbers history
+  1.0 to 1.3.X 45,3
+  1.4 to 1.4.X 46,0
+  1.5 to 1.5.X 49,0
+  1.6 to 1.5.x 50,0 NOTE Assumed for now
+*/
+
+// classfile constants
+#define JAVA_MAGIC 0xCAFEBABE
+#define JAVA_MIN_MAJOR_VERSION 45
+#define JAVA_MIN_MINOR_VERSION 3
+#define JAVA5_MAX_MAJOR_VERSION 49
+#define JAVA5_MAX_MINOR_VERSION 0
+// NOTE: Assume for now
+#define JAVA6_MAX_MAJOR_VERSION 50
+#define JAVA6_MAX_MINOR_VERSION 0
+
+// package file constants
+#define JAVA_PACKAGE_MAGIC 0xCAFED00D
+#define JAVA5_PACKAGE_MAJOR_VERSION 150
+#define JAVA5_PACKAGE_MINOR_VERSION 7
+
+#define JAVA6_PACKAGE_MAJOR_VERSION 160
+#define JAVA6_PACKAGE_MINOR_VERSION 1
+
+// magic number for gzip streams (for processing pack200-gzip data)
+#define GZIP_MAGIC 0x1F8B0800
+#define GZIP_MAGIC_MASK 0xFFFFFF00 // last \bchar\b is variable "flg" field
+
+enum
+{
+	CONSTANT_None,
+	CONSTANT_Utf8,
+	CONSTANT_unused2, /* unused, was Unicode */
+	CONSTANT_Integer,
+	CONSTANT_Float,
+	CONSTANT_Long,
+	CONSTANT_Double,
+	CONSTANT_Class,
+	CONSTANT_String,
+	CONSTANT_Fieldref,
+	CONSTANT_Methodref,
+	CONSTANT_InterfaceMethodref,
+	CONSTANT_NameandType,
+	CONSTANT_Signature = 13,
+	CONSTANT_All = 14,
+	CONSTANT_Limit = 15,
+	CONSTANT_NONE = 0,
+	CONSTANT_Literal = 20, // pseudo-tag for debugging
+	CONSTANT_Member = 21,  // pseudo-tag for debugging
+	SUBINDEX_BIT = 64,	 // combined with CONSTANT_xxx for ixTag
+	ACC_STATIC = 0x0008,
+	ACC_IC_LONG_FORM = (1 << 16), // for ic_flags
+	CLASS_ATTR_SourceFile = 17,
+	CLASS_ATTR_EnclosingMethod = 18,
+	CLASS_ATTR_InnerClasses = 23,
+	CLASS_ATTR_ClassFile_version = 24,
+	FIELD_ATTR_ConstantValue = 17,
+	METHOD_ATTR_Code = 17,
+	METHOD_ATTR_Exceptions = 18,
+	METHOD_ATTR_RuntimeVisibleParameterAnnotations = 23,
+	METHOD_ATTR_RuntimeInvisibleParameterAnnotations = 24,
+	METHOD_ATTR_AnnotationDefault = 25,
+	CODE_ATTR_StackMapTable = 0,
+	CODE_ATTR_LineNumberTable = 1,
+	CODE_ATTR_LocalVariableTable = 2,
+	CODE_ATTR_LocalVariableTypeTable = 3,
+	// X_ATTR_Synthetic = 12,  // ACC_SYNTHETIC; not predefined
+	X_ATTR_Signature = 19,
+	X_ATTR_Deprecated = 20,
+	X_ATTR_RuntimeVisibleAnnotations = 21,
+	X_ATTR_RuntimeInvisibleAnnotations = 22,
+	X_ATTR_OVERFLOW = 16,
+	X_ATTR_LIMIT_NO_FLAGS_HI = 32,
+	X_ATTR_LIMIT_FLAGS_HI = 63,
+
+#define O_ATTR_DO(F)                                                                           \
+	F(X_ATTR_OVERFLOW, 01)                                                                     \
+		/*(end)*/
+#define X_ATTR_DO(F)                                                                           \
+	O_ATTR_DO(F) F(X_ATTR_Signature, Signature) F(X_ATTR_Deprecated, Deprecated)               \
+		F(X_ATTR_RuntimeVisibleAnnotations, RuntimeVisibleAnnotations)                         \
+		F(X_ATTR_RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations)                     \
+		/*F(X_ATTR_Synthetic,Synthetic)*/                                                      \
+		/*(end)*/
+#define CLASS_ATTR_DO(F)                                                                       \
+	F(CLASS_ATTR_SourceFile, SourceFile) F(CLASS_ATTR_InnerClasses, InnerClasses)              \
+		F(CLASS_ATTR_EnclosingMethod, EnclosingMethod) F(CLASS_ATTR_ClassFile_version, 02)     \
+		/*(end)*/
+#define FIELD_ATTR_DO(F)                                                                       \
+	F(FIELD_ATTR_ConstantValue, ConstantValue)                                                 \
+		/*(end)*/
+#define METHOD_ATTR_DO(F)                                                                      \
+	F(METHOD_ATTR_Code, Code) F(METHOD_ATTR_Exceptions, Exceptions)                            \
+		F(METHOD_ATTR_RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations)  \
+		F(METHOD_ATTR_RuntimeInvisibleParameterAnnotations,                                    \
+		  RuntimeInvisibleParameterAnnotations)                                                \
+		F(METHOD_ATTR_AnnotationDefault, AnnotationDefault)                                    \
+		/*(end)*/
+#define CODE_ATTR_DO(F)                                                                        \
+	F(CODE_ATTR_StackMapTable, StackMapTable) F(CODE_ATTR_LineNumberTable, LineNumberTable)    \
+		F(CODE_ATTR_LocalVariableTable, LocalVariableTable)                                    \
+		F(CODE_ATTR_LocalVariableTypeTable, LocalVariableTypeTable)                            \
+		/*(end)*/
+#define ALL_ATTR_DO(F)                                                                         \
+	X_ATTR_DO(F) CLASS_ATTR_DO(F) FIELD_ATTR_DO(F) METHOD_ATTR_DO(F) CODE_ATTR_DO(F)           \
+		/*(end)*/
+
+	// attribute "context types"
+	ATTR_CONTEXT_CLASS = 0,
+	ATTR_CONTEXT_FIELD = 1,
+	ATTR_CONTEXT_METHOD = 2,
+	ATTR_CONTEXT_CODE = 3,
+	ATTR_CONTEXT_LIMIT = 4,
+
+	// constants for parsed layouts (stored in band::le_kind)
+	EK_NONE = 0,   // not a layout element
+	EK_INT = 'I',  // B H I SH etc., also FH etc.
+	EK_BCI = 'P',  // PH etc.
+	EK_BCID = 'Q', // POH etc.
+	EK_BCO = 'O',  // OH etc.
+	EK_REPL = 'N', // NH[...] etc.
+	EK_REF = 'R',  // RUH, RUNH, KQH, etc.
+	EK_UN = 'T',   // TB(...)[...] etc.
+	EK_CASE = 'K', // (...)[...] etc.
+	EK_CALL = '(', // (0), (1), etc.
+	EK_CBLE = '[', // [...][...] etc.
+	NO_BAND_INDEX = -1,
+
+	// File option bits, from LSB in ascending bit position.
+	FO_DEFLATE_HINT = 1 << 0,
+	FO_IS_CLASS_STUB = 1 << 1,
+
+	// Archive option bits, from LSB in ascending bit position:
+	AO_HAVE_SPECIAL_FORMATS = 1 << 0,
+	AO_HAVE_CP_NUMBERS = 1 << 1,
+	AO_HAVE_ALL_CODE_FLAGS = 1 << 2,
+	AO_3_UNUSED_MBZ = 1 << 3,
+	AO_HAVE_FILE_HEADERS = 1 << 4,
+	AO_DEFLATE_HINT = 1 << 5,
+	AO_HAVE_FILE_MODTIME = 1 << 6,
+	AO_HAVE_FILE_OPTIONS = 1 << 7,
+	AO_HAVE_FILE_SIZE_HI = 1 << 8,
+	AO_HAVE_CLASS_FLAGS_HI = 1 << 9,
+	AO_HAVE_FIELD_FLAGS_HI = 1 << 10,
+	AO_HAVE_METHOD_FLAGS_HI = 1 << 11,
+	AO_HAVE_CODE_FLAGS_HI = 1 << 12,
+#define ARCHIVE_BIT_DO(F)                                                                      \
+	F(AO_HAVE_SPECIAL_FORMATS) F(AO_HAVE_CP_NUMBERS) F(AO_HAVE_ALL_CODE_FLAGS)                 \
+		/*F(AO_3_UNUSED_MBZ)*/                                                                 \
+		F(AO_HAVE_FILE_HEADERS) F(AO_DEFLATE_HINT) F(AO_HAVE_FILE_MODTIME)                     \
+		F(AO_HAVE_FILE_OPTIONS) F(AO_HAVE_FILE_SIZE_HI) F(AO_HAVE_CLASS_FLAGS_HI)              \
+		F(AO_HAVE_FIELD_FLAGS_HI) F(AO_HAVE_METHOD_FLAGS_HI) F(AO_HAVE_CODE_FLAGS_HI)          \
+		/*(end)*/
+
+	// Constants for decoding attribute definition header bytes.
+	ADH_CONTEXT_MASK = 0x3, // (hdr & ADH_CONTEXT_MASK)
+	ADH_BIT_SHIFT = 0x2,	// (hdr >> ADH_BIT_SHIFT)
+	ADH_BIT_IS_LSB = 1,	 // (hdr >> ADH_BIT_SHIFT) - ADH_BIT_IS_LSB
+#define ADH_BYTE(context, index) ((((index) + ADH_BIT_IS_LSB) << ADH_BIT_SHIFT) + (context))
+#define ADH_BYTE_CONTEXT(adhb) ((adhb) & ADH_CONTEXT_MASK)
+#define ADH_BYTE_INDEX(adhb) (((adhb) >> ADH_BIT_SHIFT) - ADH_BIT_IS_LSB)
+	NO_MODTIME = 0, // nullptr modtime value
+
+	// meta-coding
+	_meta_default = 0,
+	_meta_canon_min = 1,
+	_meta_canon_max = 115,
+	_meta_arb = 116,
+	_meta_run = 117,
+	_meta_pop = 141,
+	_meta_limit = 189,
+	_meta_error = 255,
+	_xxx_1_end
+};
+
+// Bytecodes.
+
+enum
+{
+	bc_nop = 0,			   // 0x00
+	bc_aconst_null = 1,	   // 0x01
+	bc_iconst_m1 = 2,		 // 0x02
+	bc_iconst_0 = 3,		  // 0x03
+	bc_iconst_1 = 4,		  // 0x04
+	bc_iconst_2 = 5,		  // 0x05
+	bc_iconst_3 = 6,		  // 0x06
+	bc_iconst_4 = 7,		  // 0x07
+	bc_iconst_5 = 8,		  // 0x08
+	bc_lconst_0 = 9,		  // 0x09
+	bc_lconst_1 = 10,		 // 0x0a
+	bc_fconst_0 = 11,		 // 0x0b
+	bc_fconst_1 = 12,		 // 0x0c
+	bc_fconst_2 = 13,		 // 0x0d
+	bc_dconst_0 = 14,		 // 0x0e
+	bc_dconst_1 = 15,		 // 0x0f
+	bc_bipush = 16,		   // 0x10
+	bc_sipush = 17,		   // 0x11
+	bc_ldc = 18,			  // 0x12
+	bc_ldc_w = 19,			// 0x13
+	bc_ldc2_w = 20,		   // 0x14
+	bc_iload = 21,			// 0x15
+	bc_lload = 22,			// 0x16
+	bc_fload = 23,			// 0x17
+	bc_dload = 24,			// 0x18
+	bc_aload = 25,			// 0x19
+	bc_iload_0 = 26,		  // 0x1a
+	bc_iload_1 = 27,		  // 0x1b
+	bc_iload_2 = 28,		  // 0x1c
+	bc_iload_3 = 29,		  // 0x1d
+	bc_lload_0 = 30,		  // 0x1e
+	bc_lload_1 = 31,		  // 0x1f
+	bc_lload_2 = 32,		  // 0x20
+	bc_lload_3 = 33,		  // 0x21
+	bc_fload_0 = 34,		  // 0x22
+	bc_fload_1 = 35,		  // 0x23
+	bc_fload_2 = 36,		  // 0x24
+	bc_fload_3 = 37,		  // 0x25
+	bc_dload_0 = 38,		  // 0x26
+	bc_dload_1 = 39,		  // 0x27
+	bc_dload_2 = 40,		  // 0x28
+	bc_dload_3 = 41,		  // 0x29
+	bc_aload_0 = 42,		  // 0x2a
+	bc_aload_1 = 43,		  // 0x2b
+	bc_aload_2 = 44,		  // 0x2c
+	bc_aload_3 = 45,		  // 0x2d
+	bc_iaload = 46,		   // 0x2e
+	bc_laload = 47,		   // 0x2f
+	bc_faload = 48,		   // 0x30
+	bc_daload = 49,		   // 0x31
+	bc_aaload = 50,		   // 0x32
+	bc_baload = 51,		   // 0x33
+	bc_caload = 52,		   // 0x34
+	bc_saload = 53,		   // 0x35
+	bc_istore = 54,		   // 0x36
+	bc_lstore = 55,		   // 0x37
+	bc_fstore = 56,		   // 0x38
+	bc_dstore = 57,		   // 0x39
+	bc_astore = 58,		   // 0x3a
+	bc_istore_0 = 59,		 // 0x3b
+	bc_istore_1 = 60,		 // 0x3c
+	bc_istore_2 = 61,		 // 0x3d
+	bc_istore_3 = 62,		 // 0x3e
+	bc_lstore_0 = 63,		 // 0x3f
+	bc_lstore_1 = 64,		 // 0x40
+	bc_lstore_2 = 65,		 // 0x41
+	bc_lstore_3 = 66,		 // 0x42
+	bc_fstore_0 = 67,		 // 0x43
+	bc_fstore_1 = 68,		 // 0x44
+	bc_fstore_2 = 69,		 // 0x45
+	bc_fstore_3 = 70,		 // 0x46
+	bc_dstore_0 = 71,		 // 0x47
+	bc_dstore_1 = 72,		 // 0x48
+	bc_dstore_2 = 73,		 // 0x49
+	bc_dstore_3 = 74,		 // 0x4a
+	bc_astore_0 = 75,		 // 0x4b
+	bc_astore_1 = 76,		 // 0x4c
+	bc_astore_2 = 77,		 // 0x4d
+	bc_astore_3 = 78,		 // 0x4e
+	bc_iastore = 79,		  // 0x4f
+	bc_lastore = 80,		  // 0x50
+	bc_fastore = 81,		  // 0x51
+	bc_dastore = 82,		  // 0x52
+	bc_aastore = 83,		  // 0x53
+	bc_bastore = 84,		  // 0x54
+	bc_castore = 85,		  // 0x55
+	bc_sastore = 86,		  // 0x56
+	bc_pop = 87,			  // 0x57
+	bc_pop2 = 88,			 // 0x58
+	bc_dup = 89,			  // 0x59
+	bc_dup_x1 = 90,		   // 0x5a
+	bc_dup_x2 = 91,		   // 0x5b
+	bc_dup2 = 92,			 // 0x5c
+	bc_dup2_x1 = 93,		  // 0x5d
+	bc_dup2_x2 = 94,		  // 0x5e
+	bc_swap = 95,			 // 0x5f
+	bc_iadd = 96,			 // 0x60
+	bc_ladd = 97,			 // 0x61
+	bc_fadd = 98,			 // 0x62
+	bc_dadd = 99,			 // 0x63
+	bc_isub = 100,			// 0x64
+	bc_lsub = 101,			// 0x65
+	bc_fsub = 102,			// 0x66
+	bc_dsub = 103,			// 0x67
+	bc_imul = 104,			// 0x68
+	bc_lmul = 105,			// 0x69
+	bc_fmul = 106,			// 0x6a
+	bc_dmul = 107,			// 0x6b
+	bc_idiv = 108,			// 0x6c
+	bc_ldiv = 109,			// 0x6d
+	bc_fdiv = 110,			// 0x6e
+	bc_ddiv = 111,			// 0x6f
+	bc_irem = 112,			// 0x70
+	bc_lrem = 113,			// 0x71
+	bc_frem = 114,			// 0x72
+	bc_drem = 115,			// 0x73
+	bc_ineg = 116,			// 0x74
+	bc_lneg = 117,			// 0x75
+	bc_fneg = 118,			// 0x76
+	bc_dneg = 119,			// 0x77
+	bc_ishl = 120,			// 0x78
+	bc_lshl = 121,			// 0x79
+	bc_ishr = 122,			// 0x7a
+	bc_lshr = 123,			// 0x7b
+	bc_iushr = 124,		   // 0x7c
+	bc_lushr = 125,		   // 0x7d
+	bc_iand = 126,			// 0x7e
+	bc_land = 127,			// 0x7f
+	bc_ior = 128,			 // 0x80
+	bc_lor = 129,			 // 0x81
+	bc_ixor = 130,			// 0x82
+	bc_lxor = 131,			// 0x83
+	bc_iinc = 132,			// 0x84
+	bc_i2l = 133,			 // 0x85
+	bc_i2f = 134,			 // 0x86
+	bc_i2d = 135,			 // 0x87
+	bc_l2i = 136,			 // 0x88
+	bc_l2f = 137,			 // 0x89
+	bc_l2d = 138,			 // 0x8a
+	bc_f2i = 139,			 // 0x8b
+	bc_f2l = 140,			 // 0x8c
+	bc_f2d = 141,			 // 0x8d
+	bc_d2i = 142,			 // 0x8e
+	bc_d2l = 143,			 // 0x8f
+	bc_d2f = 144,			 // 0x90
+	bc_i2b = 145,			 // 0x91
+	bc_i2c = 146,			 // 0x92
+	bc_i2s = 147,			 // 0x93
+	bc_lcmp = 148,			// 0x94
+	bc_fcmpl = 149,		   // 0x95
+	bc_fcmpg = 150,		   // 0x96
+	bc_dcmpl = 151,		   // 0x97
+	bc_dcmpg = 152,		   // 0x98
+	bc_ifeq = 153,			// 0x99
+	bc_ifne = 154,			// 0x9a
+	bc_iflt = 155,			// 0x9b
+	bc_ifge = 156,			// 0x9c
+	bc_ifgt = 157,			// 0x9d
+	bc_ifle = 158,			// 0x9e
+	bc_if_icmpeq = 159,	   // 0x9f
+	bc_if_icmpne = 160,	   // 0xa0
+	bc_if_icmplt = 161,	   // 0xa1
+	bc_if_icmpge = 162,	   // 0xa2
+	bc_if_icmpgt = 163,	   // 0xa3
+	bc_if_icmple = 164,	   // 0xa4
+	bc_if_acmpeq = 165,	   // 0xa5
+	bc_if_acmpne = 166,	   // 0xa6
+	bc_goto = 167,			// 0xa7
+	bc_jsr = 168,			 // 0xa8
+	bc_ret = 169,			 // 0xa9
+	bc_tableswitch = 170,	 // 0xaa
+	bc_lookupswitch = 171,	// 0xab
+	bc_ireturn = 172,		 // 0xac
+	bc_lreturn = 173,		 // 0xad
+	bc_freturn = 174,		 // 0xae
+	bc_dreturn = 175,		 // 0xaf
+	bc_areturn = 176,		 // 0xb0
+	bc_return = 177,		  // 0xb1
+	bc_getstatic = 178,	   // 0xb2
+	bc_putstatic = 179,	   // 0xb3
+	bc_getfield = 180,		// 0xb4
+	bc_putfield = 181,		// 0xb5
+	bc_invokevirtual = 182,   // 0xb6
+	bc_invokespecial = 183,   // 0xb7
+	bc_invokestatic = 184,	// 0xb8
+	bc_invokeinterface = 185, // 0xb9
+	bc_xxxunusedxxx = 186,	// 0xba
+	bc_new = 187,			 // 0xbb
+	bc_newarray = 188,		// 0xbc
+	bc_anewarray = 189,	   // 0xbd
+	bc_arraylength = 190,	 // 0xbe
+	bc_athrow = 191,		  // 0xbf
+	bc_checkcast = 192,	   // 0xc0
+	bc_instanceof = 193,	  // 0xc1
+	bc_monitorenter = 194,	// 0xc2
+	bc_monitorexit = 195,	 // 0xc3
+	bc_wide = 196,			// 0xc4
+	bc_multianewarray = 197,  // 0xc5
+	bc_ifnull = 198,		  // 0xc6
+	bc_ifnonnull = 199,	   // 0xc7
+	bc_goto_w = 200,		  // 0xc8
+	bc_jsr_w = 201,		   // 0xc9
+	bc_bytecode_limit = 202   // 0xca
+};
+
+enum
+{
+	bc_end_marker = 255,
+	bc_byte_escape = 254,
+	bc_ref_escape = 253,
+	_first_linker_op = bc_getstatic,
+	_last_linker_op = bc_invokestatic,
+	_num_linker_ops = (_last_linker_op - _first_linker_op) + 1,
+	_self_linker_op = bc_bytecode_limit,
+	_self_linker_aload_flag = 1 * _num_linker_ops,
+	_self_linker_super_flag = 2 * _num_linker_ops,
+	_self_linker_limit = _self_linker_op + 4 * _num_linker_ops,
+	_invokeinit_op = _self_linker_limit,
+	_invokeinit_self_option = 0,
+	_invokeinit_super_option = 1,
+	_invokeinit_new_option = 2,
+	_invokeinit_limit = _invokeinit_op + 3,
+	_xldc_op = _invokeinit_limit,
+	bc_aldc = bc_ldc,
+	bc_cldc = _xldc_op + 0,
+	bc_ildc = _xldc_op + 1,
+	bc_fldc = _xldc_op + 2,
+	bc_aldc_w = bc_ldc_w,
+	bc_cldc_w = _xldc_op + 3,
+	bc_ildc_w = _xldc_op + 4,
+	bc_fldc_w = _xldc_op + 5,
+	bc_lldc2_w = bc_ldc2_w,
+	bc_dldc2_w = _xldc_op + 6,
+	_xldc_limit = _xldc_op + 7,
+	_xxx_3_end
+};
diff --git a/libraries/pack200/src/defines.h b/libraries/pack200/src/defines.h
new file mode 100644
index 00000000..cfe5fc28
--- /dev/null
+++ b/libraries/pack200/src/defines.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// random definitions
+
+#ifdef _MSC_VER
+#include <windows.h>
+#include <winuser.h>
+#else
+#include <unistd.h>
+#endif
+
+// Error messages that we have
+#define ERROR_ENOMEM "Memory allocation failed"
+#define ERROR_FORMAT "Corrupted pack file"
+#define ERROR_RESOURCE "Cannot extract resource file"
+#define ERROR_OVERFLOW "Internal buffer overflow"
+#define ERROR_INTERNAL "Internal error"
+
+#define lengthof(array) (sizeof(array) / sizeof(array[0]))
+
+#define NEW(T, n) (T *) must_malloc((int)(scale_size(n, sizeof(T))))
+#define U_NEW(T, n) (T *) u->alloc(scale_size(n, sizeof(T)))
+#define T_NEW(T, n) (T *) u->temp_alloc(scale_size(n, sizeof(T)))
+
+typedef signed char byte;
+
+#ifdef _MSC_VER
+#define MKDIR(dir) mkdir(dir)
+#define getpid() _getpid()
+#define PATH_MAX MAX_PATH
+#define dup2(a, b) _dup2(a, b)
+#define strcasecmp(s1, s2) _stricmp(s1, s2)
+#define tempname _tempname
+#define sleep Sleep
+#else
+#define MKDIR(dir) mkdir(dir, 0777);
+#endif
+
+/* Must cast to void *, then size_t, then int. */
+#define ptrlowbits(x) ((int)(size_t)(void *)(x))
+
+#define DEFAULT_ARCHIVE_MODTIME 1060000000 // Aug 04, 2003 5:26 PM PDT
diff --git a/libraries/pack200/src/unpack.cpp b/libraries/pack200/src/unpack.cpp
new file mode 100644
index 00000000..55d253b2
--- /dev/null
+++ b/libraries/pack200/src/unpack.cpp
@@ -0,0 +1,4793 @@
+/*
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// -*- C++ -*-
+// Program for unpacking specially compressed Java packages.
+// John R. Rose
+
+/*
+ * When compiling for a 64bit LP64 system (longs and pointers being 64bits),
+ *    the printf format %ld is correct and use of %lld will cause warning
+ *    errors from some compilers (gcc/g++).
+ * _LP64 can be explicitly set (used on Linux).
+ * Solaris compilers will define __sparcv9 or __x86_64 on 64bit compilations.
+ */
+#if defined(_LP64) || defined(__sparcv9) || defined(__x86_64)
+#define LONG_LONG_FORMAT "%ld"
+#define LONG_LONG_HEX_FORMAT "%lx"
+#else
+#define LONG_LONG_FORMAT "%lld"
+#define LONG_LONG_HEX_FORMAT "%016llx"
+#endif
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <limits.h>
+#include <time.h>
+#include <stdint.h>
+
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+#include "coding.h"
+#include "bands.h"
+
+#include "constants.h"
+
+#include "zip.h"
+
+#include "unpack.h"
+
+// tags, in canonical order:
+static const byte TAGS_IN_ORDER[] = {
+	CONSTANT_Utf8,		CONSTANT_Integer,  CONSTANT_Float,	 CONSTANT_Long,
+	CONSTANT_Double,	  CONSTANT_String,   CONSTANT_Class,	 CONSTANT_Signature,
+	CONSTANT_NameandType, CONSTANT_Fieldref, CONSTANT_Methodref, CONSTANT_InterfaceMethodref};
+#define N_TAGS_IN_ORDER (sizeof TAGS_IN_ORDER)
+
+// REQUESTED must be -2 for u2 and REQUESTED_LDC must be -1 for u1
+enum
+{
+	NOT_REQUESTED = 0,
+	REQUESTED = -2,
+	REQUESTED_LDC = -1
+};
+
+#define NO_INORD ((uint32_t) - 1)
+
+struct entry
+{
+	byte tag;
+	unsigned short nrefs; // pack w/ tag
+
+	int outputIndex;
+	uint32_t inord; // &cp.entries[cp.tag_base[this->tag]+this->inord] == this
+
+	entry **refs;
+
+	// put last to pack best
+	union
+	{
+		bytes b;
+		int i;
+		int64_t l;
+	} value;
+
+	void requestOutputIndex(constant_pool &cp, int req = REQUESTED);
+	int getOutputIndex()
+	{
+		assert(outputIndex > NOT_REQUESTED);
+		return outputIndex;
+	}
+
+	entry *ref(int refnum)
+	{
+		assert((uint32_t)refnum < nrefs);
+		return refs[refnum];
+	}
+
+	const char *utf8String()
+	{
+		assert(tagMatches(CONSTANT_Utf8));
+		assert(value.b.len == strlen((const char *)value.b.ptr));
+		return (const char *)value.b.ptr;
+	}
+
+	entry *className()
+	{
+		assert(tagMatches(CONSTANT_Class));
+		return ref(0);
+	}
+
+	entry *memberClass()
+	{
+		assert(tagMatches(CONSTANT_Member));
+		return ref(0);
+	}
+
+	entry *memberDescr()
+	{
+		assert(tagMatches(CONSTANT_Member));
+		return ref(1);
+	}
+
+	entry *descrName()
+	{
+		assert(tagMatches(CONSTANT_NameandType));
+		return ref(0);
+	}
+
+	entry *descrType()
+	{
+		assert(tagMatches(CONSTANT_NameandType));
+		return ref(1);
+	}
+
+	int typeSize();
+
+	bytes &asUtf8();
+	int asInteger()
+	{
+		assert(tag == CONSTANT_Integer);
+		return value.i;
+	}
+
+	bool isUtf8(bytes &b)
+	{
+		return tagMatches(CONSTANT_Utf8) && value.b.equals(b);
+	}
+
+	bool isDoubleWord()
+	{
+		return tag == CONSTANT_Double || tag == CONSTANT_Long;
+	}
+
+	bool tagMatches(byte tag2)
+	{
+		return (tag2 == tag) || (tag2 == CONSTANT_Utf8 && tag == CONSTANT_Signature) ||
+			   (tag2 == CONSTANT_Literal && tag >= CONSTANT_Integer && tag <= CONSTANT_String &&
+				tag != CONSTANT_Class) ||
+			   (tag2 == CONSTANT_Member && tag >= CONSTANT_Fieldref &&
+				tag <= CONSTANT_InterfaceMethodref);
+	}
+};
+
+entry *cpindex::get(uint32_t i)
+{
+	if (i >= len)
+		return nullptr;
+	else if (base1 != nullptr)
+		// primary index
+		return &base1[i];
+	else
+		// secondary index
+		return base2[i];
+}
+
+inline bytes &entry::asUtf8()
+{
+	assert(tagMatches(CONSTANT_Utf8));
+	return value.b;
+}
+
+int entry::typeSize()
+{
+	assert(tagMatches(CONSTANT_Utf8));
+	const char *sigp = (char *)value.b.ptr;
+	switch (*sigp)
+	{
+	case '(':
+		sigp++;
+		break; // skip opening '('
+	case 'D':
+	case 'J':
+		return 2; // double field
+	default:
+		return 1; // field
+	}
+	int siglen = 0;
+	for (;;)
+	{
+		int ch = *sigp++;
+		switch (ch)
+		{
+		case 'D':
+		case 'J':
+			siglen += 1;
+			break;
+		case '[':
+			// Skip rest of array info.
+			while (ch == '[')
+			{
+				ch = *sigp++;
+			}
+			if (ch != 'L')
+				break;
+		// else fall through
+		case 'L':
+			sigp = strchr(sigp, ';');
+			if (sigp == nullptr)
+			{
+				unpack_abort("bad data");
+				return 0;
+			}
+			sigp += 1;
+			break;
+		case ')': // closing ')'
+			return siglen;
+		}
+		siglen += 1;
+	}
+}
+
+inline cpindex *constant_pool::getFieldIndex(entry *classRef)
+{
+	assert(classRef->tagMatches(CONSTANT_Class));
+	assert((uint32_t)classRef->inord < (uint32_t)tag_count[CONSTANT_Class]);
+	return &member_indexes[classRef->inord * 2 + 0];
+}
+inline cpindex *constant_pool::getMethodIndex(entry *classRef)
+{
+	assert(classRef->tagMatches(CONSTANT_Class));
+	assert((uint32_t)classRef->inord < (uint32_t)tag_count[CONSTANT_Class]);
+	return &member_indexes[classRef->inord * 2 + 1];
+}
+
+struct inner_class
+{
+	entry *inner;
+	entry *outer;
+	entry *name;
+	int flags;
+	inner_class *next_sibling;
+	bool requested;
+};
+
+// Here is where everything gets deallocated:
+void unpacker::free()
+{
+	int i;
+	if (jarout != nullptr)
+		jarout->reset();
+	if (gzin != nullptr)
+	{
+		gzin->free();
+		gzin = nullptr;
+	}
+	if (free_input)
+		input.free();
+	/*
+	 * free everybody ever allocated with U_NEW or (recently) with T_NEW
+	 */
+	assert(smallbuf.base() == nullptr || mallocs.contains(smallbuf.base()));
+	assert(tsmallbuf.base() == nullptr || tmallocs.contains(tsmallbuf.base()));
+	mallocs.freeAll();
+	tmallocs.freeAll();
+	smallbuf.init();
+	tsmallbuf.init();
+	bcimap.free();
+	class_fixup_type.free();
+	class_fixup_offset.free();
+	class_fixup_ref.free();
+	code_fixup_type.free();
+	code_fixup_offset.free();
+	code_fixup_source.free();
+	requested_ics.free();
+	cur_classfile_head.free();
+	cur_classfile_tail.free();
+	for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
+		attr_defs[i].free();
+
+	// free CP state
+	cp.outputEntries.free();
+	for (i = 0; i < CONSTANT_Limit; i++)
+		cp.tag_extras[i].free();
+}
+
+// input handling
+// Attempts to advance rplimit so that (rplimit-rp) is at least 'more'.
+// Will eagerly read ahead by larger chunks, if possible.
+// Returns false if (rplimit-rp) is not at least 'more',
+// unless rplimit hits input.limit().
+bool unpacker::ensure_input(int64_t more)
+{
+	uint64_t want = more - input_remaining();
+	if ((int64_t)want <= 0)
+		return true; // it's already in the buffer
+	if (rplimit == input.limit())
+		return true; // not expecting any more
+
+	if (read_input_fn == nullptr)
+	{
+		// assume it is already all there
+		bytes_read += input.limit() - rplimit;
+		rplimit = input.limit();
+		return true;
+	}
+
+	uint64_t remaining = (input.limit() - rplimit); // how much left to read?
+	byte *rpgoal = (want >= remaining) ? input.limit() : rplimit + (size_t)want;
+	enum
+	{
+		CHUNK_SIZE = (1 << 14)
+	};
+	uint64_t fetch = want;
+	if (fetch < CHUNK_SIZE)
+		fetch = CHUNK_SIZE;
+	if (fetch > remaining * 3 / 4)
+		fetch = remaining;
+	// Try to fetch at least "more" bytes.
+	while ((int64_t)fetch > 0)
+	{
+		int64_t nr = (*read_input_fn)(this, rplimit, fetch, remaining);
+		if (nr <= 0)
+		{
+			return (rplimit >= rpgoal);
+		}
+		remaining -= nr;
+		rplimit += nr;
+		fetch -= nr;
+		bytes_read += nr;
+		assert(remaining == (uint64_t)(input.limit() - rplimit));
+	}
+	return true;
+}
+
+// output handling
+
+fillbytes *unpacker::close_output(fillbytes *which)
+{
+	assert(wp != nullptr);
+	if (which == nullptr)
+	{
+		if (wpbase == cur_classfile_head.base())
+		{
+			which = &cur_classfile_head;
+		}
+		else
+		{
+			which = &cur_classfile_tail;
+		}
+	}
+	assert(wpbase == which->base());
+	assert(wplimit == which->end());
+	which->setLimit(wp);
+	wp = nullptr;
+	wplimit = nullptr;
+	// wpbase = nullptr;
+	return which;
+}
+
+// maybe_inline
+void unpacker::ensure_put_space(size_t size)
+{
+	if (wp + size <= wplimit)
+		return;
+	// Determine which segment needs expanding.
+	fillbytes *which = close_output();
+	byte *wp0 = which->grow(size);
+	wpbase = which->base();
+	wplimit = which->end();
+	wp = wp0;
+}
+
+byte *unpacker::put_space(size_t size)
+{
+	byte *wp0 = wp;
+	byte *wp1 = wp0 + size;
+	if (wp1 > wplimit)
+	{
+		ensure_put_space(size);
+		wp0 = wp;
+		wp1 = wp0 + size;
+	}
+	wp = wp1;
+	return wp0;
+}
+
+void unpacker::putu2_at(byte *wp, int n)
+{
+	if (n != (unsigned short)n)
+	{
+		unpack_abort(ERROR_OVERFLOW);
+		return;
+	}
+	wp[0] = (n) >> 8;
+	wp[1] = (n) >> 0;
+}
+
+void unpacker::putu4_at(byte *wp, int n)
+{
+	wp[0] = (n) >> 24;
+	wp[1] = (n) >> 16;
+	wp[2] = (n) >> 8;
+	wp[3] = (n) >> 0;
+}
+
+void unpacker::putu8_at(byte *wp, int64_t n)
+{
+	putu4_at(wp + 0, (int)((uint64_t)n >> 32));
+	putu4_at(wp + 4, (int)((uint64_t)n >> 0));
+}
+
+void unpacker::putu2(int n)
+{
+	putu2_at(put_space(2), n);
+}
+
+void unpacker::putu4(int n)
+{
+	putu4_at(put_space(4), n);
+}
+
+void unpacker::putu8(int64_t n)
+{
+	putu8_at(put_space(8), n);
+}
+
+int unpacker::putref_index(entry *e, int size)
+{
+	if (e == nullptr)
+		return 0;
+	else if (e->outputIndex > NOT_REQUESTED)
+		return e->outputIndex;
+	else if (e->tag == CONSTANT_Signature)
+		return putref_index(e->ref(0), size);
+	else
+	{
+		e->requestOutputIndex(cp, -size);
+		// Later on we'll fix the bits.
+		class_fixup_type.addByte(size);
+		class_fixup_offset.add((int)wpoffset());
+		class_fixup_ref.add(e);
+		return 0;
+	}
+}
+
+void unpacker::putref(entry *e)
+{
+	int oidx = putref_index(e, 2);
+	putu2_at(put_space(2), oidx);
+}
+
+void unpacker::putu1ref(entry *e)
+{
+	int oidx = putref_index(e, 1);
+	putu1_at(put_space(1), oidx);
+}
+
+// Allocation of small and large blocks.
+
+enum
+{
+	CHUNK = (1 << 14),
+	SMALL = (1 << 9)
+};
+
+// Call malloc.  Try to combine small blocks and free much later.
+void *unpacker::alloc_heap(size_t size, bool smallOK, bool temp)
+{
+	if (!smallOK || size > SMALL)
+	{
+		void *res = must_malloc((int)size);
+		(temp ? &tmallocs : &mallocs)->add(res);
+		return res;
+	}
+	fillbytes &xsmallbuf = *(temp ? &tsmallbuf : &smallbuf);
+	if (!xsmallbuf.canAppend(size + 1))
+	{
+		xsmallbuf.init(CHUNK);
+		(temp ? &tmallocs : &mallocs)->add(xsmallbuf.base());
+	}
+	int growBy = (int)size;
+	growBy += -growBy & 7; // round up mod 8
+	return xsmallbuf.grow(growBy);
+}
+
+void unpacker::saveTo(bytes &b, byte *ptr, size_t len)
+{
+	b.ptr = U_NEW(byte, add_size(len, 1));
+	b.len = len;
+	b.copyFrom(ptr, len);
+}
+
+// Read up through band_headers.
+// Do the archive_size dance to set the size of the input mega-buffer.
+void unpacker::read_file_header()
+{
+	// Read file header to determine file type and total size.
+	enum
+	{
+		MAGIC_BYTES = 4,
+		AH_LENGTH_0 = 3, // minver, majver, options are outside of archive_size
+		AH_LENGTH_0_MAX = AH_LENGTH_0 + 1, // options might have 2 bytes
+		AH_LENGTH = 26,					// maximum archive header length (w/ all fields)
+		// Length contributions from optional header fields:
+		AH_FILE_HEADER_LEN = 5,	// sizehi/lo/next/modtime/files
+		AH_ARCHIVE_SIZE_LEN = 2,   // sizehi/lo only; part of AH_FILE_HEADER_LEN
+		AH_CP_NUMBER_LEN = 4,	  // int/float/long/double
+		AH_SPECIAL_FORMAT_LEN = 2, // layouts/band-headers
+		AH_LENGTH_MIN =
+			AH_LENGTH - (AH_FILE_HEADER_LEN + AH_SPECIAL_FORMAT_LEN + AH_CP_NUMBER_LEN),
+		ARCHIVE_SIZE_MIN = AH_LENGTH_MIN - (AH_LENGTH_0 + AH_ARCHIVE_SIZE_LEN),
+		FIRST_READ = MAGIC_BYTES + AH_LENGTH_MIN
+	};
+
+	assert(AH_LENGTH_MIN == 15);	// # of UNSIGNED5 fields required after archive_magic
+	assert(ARCHIVE_SIZE_MIN == 10); // # of UNSIGNED5 fields required after archive_size
+	// An absolute minimum nullptr archive is magic[4], {minver,majver,options}[3],
+	// archive_size[0], cp_counts[8], class_counts[4], for a total of 19 bytes.
+	// (Note that archive_size is optional; it may be 0..10 bytes in length.)
+	// The first read must capture everything up through the options field.
+	// This happens to work even if {minver,majver,options} is a pathological
+	// 15 bytes long.  Legal pack files limit those three fields to 1+1+2 bytes.
+	assert(FIRST_READ >= MAGIC_BYTES + AH_LENGTH_0 * B_MAX);
+
+	// Up through archive_size, the largest possible archive header is
+	// magic[4], {minver,majver,options}[4], archive_size[10].
+	// (Note only the low 12 bits of options are allowed to be non-zero.)
+	// In order to parse archive_size, we need at least this many bytes
+	// in the first read.  Of course, if archive_size_hi is more than
+	// a byte, we probably will fail to allocate the buffer, since it
+	// will be many gigabytes long.  This is a practical, not an
+	// architectural limit to Pack200 archive sizes.
+	assert(FIRST_READ >= MAGIC_BYTES + AH_LENGTH_0_MAX + 2 * B_MAX);
+
+	bool foreign_buf = (read_input_fn == nullptr);
+	byte initbuf[(int)FIRST_READ + (int)C_SLOP + 200]; // 200 is for JAR I/O
+	if (foreign_buf)
+	{
+		// inbytes is all there is
+		input.set(inbytes);
+		rp = input.base();
+		rplimit = input.limit();
+	}
+	else
+	{
+		// inbytes, if not empty, contains some read-ahead we must use first
+		// ensure_input will take care of copying it into initbuf,
+		// then querying read_input_fn for any additional data needed.
+		// However, the caller must assume that we use up all of inbytes.
+		// There is no way to tell the caller that we used only part of them.
+		// Therefore, the caller must use only a bare minimum of read-ahead.
+		if (inbytes.len > FIRST_READ)
+		{
+			unpack_abort("too much read-ahead");
+		}
+		input.set(initbuf, sizeof(initbuf));
+		input.b.clear();
+		input.b.copyFrom(inbytes);
+		rplimit = rp = input.base();
+		rplimit += inbytes.len;
+		bytes_read += inbytes.len;
+	}
+	// Read only 19 bytes, which is certain to contain #archive_options fields,
+	// but is certain not to overflow past the archive_header.
+	input.b.len = FIRST_READ;
+	if (!ensure_input(FIRST_READ))
+		unpack_abort("EOF reading archive magic number");
+
+	if (rp[0] == 'P' && rp[1] == 'K')
+	{
+		// In the Unix-style program, we simply simulate a copy command.
+		// Copy until EOF; assume the JAR file is the last segment.
+		fprintf(stderr, "Copy-mode.\n");
+		for (;;)
+		{
+			jarout->write_data(rp, (int)input_remaining());
+			if (foreign_buf)
+				break; // one-time use of a passed in buffer
+			if (input.size() < CHUNK)
+			{
+				// Get some breathing room.
+				input.set(U_NEW(byte, (size_t)CHUNK + C_SLOP), (size_t)CHUNK);
+			}
+			rp = rplimit = input.base();
+			if (!ensure_input(1))
+				break;
+		}
+		jarout->closeJarFile(false);
+		return;
+	}
+
+	// Read the magic number.
+	magic = 0;
+	for (int i1 = 0; i1 < (int)sizeof(magic); i1++)
+	{
+		magic <<= 8;
+		magic += (*rp++ & 0xFF);
+	}
+
+	// Read the first 3 values from the header.
+	value_stream hdr;
+	int hdrVals = 0;
+	int hdrValsSkipped = 0; // debug only
+	hdr.init(rp, rplimit, UNSIGNED5_spec);
+	minver = hdr.getInt();
+	majver = hdr.getInt();
+	hdrVals += 2;
+
+	if (magic != (int)JAVA_PACKAGE_MAGIC ||
+		(majver != JAVA5_PACKAGE_MAJOR_VERSION && majver != JAVA6_PACKAGE_MAJOR_VERSION) ||
+		(minver != JAVA5_PACKAGE_MINOR_VERSION && minver != JAVA6_PACKAGE_MINOR_VERSION))
+	{
+		char message[200];
+		sprintf(message, "@" ERROR_FORMAT ": magic/ver = "
+						 "%08X/%d.%d should be %08X/%d.%d OR %08X/%d.%d\n",
+				magic, majver, minver, JAVA_PACKAGE_MAGIC, JAVA5_PACKAGE_MAJOR_VERSION,
+				JAVA5_PACKAGE_MINOR_VERSION, JAVA_PACKAGE_MAGIC, JAVA6_PACKAGE_MAJOR_VERSION,
+				JAVA6_PACKAGE_MINOR_VERSION);
+		unpack_abort(message);
+	}
+
+	archive_options = hdr.getInt();
+	hdrVals += 1;
+	assert(hdrVals == AH_LENGTH_0); // first three fields only
+
+#define ORBIT(bit) | (bit)
+	int OPTION_LIMIT = (0 ARCHIVE_BIT_DO(ORBIT));
+#undef ORBIT
+	if ((archive_options & ~OPTION_LIMIT) != 0)
+	{
+		fprintf(stderr, "Warning: Illegal archive options 0x%x\n", archive_options);
+		unpack_abort("illegal archive options");
+		return;
+	}
+
+	if ((archive_options & AO_HAVE_FILE_HEADERS) != 0)
+	{
+		uint32_t hi = hdr.getInt();
+		uint32_t lo = hdr.getInt();
+		uint64_t x = band::makeLong(hi, lo);
+		archive_size = (size_t)x;
+		if (archive_size != x)
+		{
+			// Silly size specified; force overflow.
+			archive_size = PSIZE_MAX + 1;
+		}
+		hdrVals += 2;
+	}
+	else
+	{
+		hdrValsSkipped += 2;
+	}
+
+	// Now we can size the whole archive.
+	// Read everything else into a mega-buffer.
+	rp = hdr.rp;
+	int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
+	int header_size_1 = (int)(rplimit - rp);	  // buffered unused initial fragment
+	int header_size = header_size_0 + header_size_1;
+	unsized_bytes_read = header_size_0;
+	if (foreign_buf)
+	{
+		if (archive_size > (size_t)header_size_1)
+		{
+			unpack_abort("EOF reading fixed input buffer");
+			return;
+		}
+	}
+	else if (archive_size != 0)
+	{
+		if (archive_size < ARCHIVE_SIZE_MIN)
+		{
+			unpack_abort("impossible archive size"); // bad input data
+			return;
+		}
+		if (archive_size < (size_t)header_size_1)
+		{
+			unpack_abort("too much read-ahead"); // somehow we pre-fetched too much?
+			return;
+		}
+		input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
+				  (size_t)header_size_0 + archive_size);
+		assert(input.limit()[0] == 0);
+		// Move all the bytes we read initially into the real buffer.
+		input.b.copyFrom(initbuf, header_size);
+		rp = input.b.ptr + header_size_0;
+		rplimit = input.b.ptr + header_size;
+	}
+	else
+	{
+		// It's more complicated and painful.
+		// A zero archive_size means that we must read until EOF.
+		input.init(CHUNK * 2);
+		input.b.len = input.allocated;
+		rp = rplimit = input.base();
+		// Set up input buffer as if we already read the header:
+		input.b.copyFrom(initbuf, header_size);
+		rplimit += header_size;
+		while (ensure_input(input.limit() - rp))
+		{
+			size_t dataSoFar = input_remaining();
+			size_t nextSize = add_size(dataSoFar, CHUNK);
+			input.ensureSize(nextSize);
+			input.b.len = input.allocated;
+			rp = rplimit = input.base();
+			rplimit += dataSoFar;
+		}
+		size_t dataSize = (rplimit - input.base());
+		input.b.len = dataSize;
+		input.grow(C_SLOP);
+		free_input = true; // free it later
+		input.b.len = dataSize;
+		assert(input.limit()[0] == 0);
+		rp = rplimit = input.base();
+		rplimit += dataSize;
+		rp += header_size_0; // already scanned these bytes...
+	}
+	live_input = true; // mark as "do not reuse"
+
+	// read the rest of the header fields
+	ensure_input((AH_LENGTH - AH_LENGTH_0) * B_MAX);
+	hdr.rp = rp;
+	hdr.rplimit = rplimit;
+
+	if ((archive_options & AO_HAVE_FILE_HEADERS) != 0)
+	{
+		archive_next_count = hdr.getInt();
+		if (archive_next_count < 0)
+			unpack_abort("bad archive_next_count");
+		archive_modtime = hdr.getInt();
+		file_count = hdr.getInt();
+		if (file_count < 0)
+			unpack_abort("bad file_count");
+		hdrVals += 3;
+	}
+	else
+	{
+		hdrValsSkipped += 3;
+	}
+
+	if ((archive_options & AO_HAVE_SPECIAL_FORMATS) != 0)
+	{
+		band_headers_size = hdr.getInt();
+		if (band_headers_size < 0)
+			unpack_abort("bad band_headers_size");
+		attr_definition_count = hdr.getInt();
+		if (attr_definition_count < 0)
+			unpack_abort("bad attr_definition_count");
+		hdrVals += 2;
+	}
+	else
+	{
+		hdrValsSkipped += 2;
+	}
+
+	int cp_counts[N_TAGS_IN_ORDER];
+	for (int k = 0; k < (int)N_TAGS_IN_ORDER; k++)
+	{
+		if (!(archive_options & AO_HAVE_CP_NUMBERS))
+		{
+			switch (TAGS_IN_ORDER[k])
+			{
+			case CONSTANT_Integer:
+			case CONSTANT_Float:
+			case CONSTANT_Long:
+			case CONSTANT_Double:
+				cp_counts[k] = 0;
+				hdrValsSkipped += 1;
+				continue;
+			}
+		}
+		cp_counts[k] = hdr.getInt();
+		if (cp_counts[k] < 0)
+			unpack_abort("bad cp_counts");
+		hdrVals += 1;
+	}
+
+	ic_count = hdr.getInt();
+	if (ic_count < 0)
+		unpack_abort("bad ic_count");
+
+	default_class_minver = hdr.getInt();
+	default_class_majver = hdr.getInt();
+
+	class_count = hdr.getInt();
+	if (class_count < 0)
+		unpack_abort("bad class_count");
+
+	hdrVals += 4;
+
+	// done with archive_header
+	hdrVals += hdrValsSkipped;
+	assert(hdrVals == AH_LENGTH);
+
+	rp = hdr.rp;
+	if (rp > rplimit)
+		unpack_abort("EOF reading archive header");
+
+	// Now size the CP.
+	cp.init(this, cp_counts);
+
+	default_file_modtime = archive_modtime;
+	if (default_file_modtime == 0 && !(archive_options & AO_HAVE_FILE_MODTIME))
+		default_file_modtime = DEFAULT_ARCHIVE_MODTIME; // taken from driver
+	if ((archive_options & AO_DEFLATE_HINT) != 0)
+		default_file_options |= FO_DEFLATE_HINT;
+
+	// meta-bytes, if any, immediately follow archive header
+	// band_headers.readData(band_headers_size);
+	ensure_input(band_headers_size);
+	if (input_remaining() < (size_t)band_headers_size)
+	{
+		unpack_abort("EOF reading band headers");
+		return;
+	}
+	bytes band_headers;
+	// The "1+" allows an initial byte to be pushed on the front.
+	band_headers.set(1 + U_NEW(byte, 1 + band_headers_size + C_SLOP), band_headers_size);
+
+	// Start scanning band headers here:
+	band_headers.copyFrom(rp, band_headers.len);
+	rp += band_headers.len;
+	assert(rp <= rplimit);
+	meta_rp = band_headers.ptr;
+	// Put evil meta-codes at the end of the band headers,
+	// so we are sure to throw an error if we run off the end.
+	bytes::of(band_headers.limit(), C_SLOP).clear(_meta_error);
+}
+
+void unpacker::finish()
+{
+	if (verbose >= 1)
+	{
+		fprintf(stderr, "A total of " LONG_LONG_FORMAT " bytes were read in %d segment(s).\n",
+				(bytes_read_before_reset + bytes_read), segments_read_before_reset + 1);
+		fprintf(stderr, "A total of " LONG_LONG_FORMAT " file content bytes were written.\n",
+				(bytes_written_before_reset + bytes_written));
+		fprintf(stderr,
+				"A total of %d files (of which %d are classes) were written to output.\n",
+				files_written_before_reset + files_written,
+				classes_written_before_reset + classes_written);
+	}
+	if (jarout != nullptr)
+		jarout->closeJarFile(true);
+}
+
+// Cf. PackageReader.readConstantPoolCounts
+void constant_pool::init(unpacker *u_, int counts[NUM_COUNTS])
+{
+	this->u = u_;
+
+	// Fill-pointer for CP.
+	int next_entry = 0;
+
+	// Size the constant pool:
+	for (int k = 0; k < (int)N_TAGS_IN_ORDER; k++)
+	{
+		byte tag = TAGS_IN_ORDER[k];
+		int len = counts[k];
+		tag_count[tag] = len;
+		tag_base[tag] = next_entry;
+		next_entry += len;
+		// Detect and defend against constant pool size overflow.
+		// (Pack200 forbids the sum of CP counts to exceed 2^29-1.)
+		enum
+		{
+			CP_SIZE_LIMIT = (1 << 29),
+			IMPLICIT_ENTRY_COUNT = 1 // empty Utf8 string
+		};
+		if (len >= (1 << 29) || len < 0 || next_entry >= CP_SIZE_LIMIT + IMPLICIT_ENTRY_COUNT)
+		{
+			unpack_abort("archive too large:  constant pool limit exceeded");
+		}
+	}
+
+	// Close off the end of the CP:
+	nentries = next_entry;
+
+	// place a limit on future CP growth:
+	int generous = 0;
+	generous = add_size(generous, u->ic_count);	// implicit name
+	generous = add_size(generous, u->ic_count);	// outer
+	generous = add_size(generous, u->ic_count);	// outer.utf8
+	generous = add_size(generous, 40);			 // WKUs, misc
+	generous = add_size(generous, u->class_count); // implicit SourceFile strings
+	maxentries = add_size(nentries, generous);
+
+	// Note that this CP does not include "empty" entries
+	// for longs and doubles.  Those are introduced when
+	// the entries are renumbered for classfile output.
+
+	entries = U_NEW(entry, maxentries);
+
+	first_extra_entry = &entries[nentries];
+
+	// Initialize the standard indexes.
+	tag_count[CONSTANT_All] = nentries;
+	tag_base[CONSTANT_All] = 0;
+	for (int tag = 0; tag < CONSTANT_Limit; tag++)
+	{
+		entry *cpMap = &entries[tag_base[tag]];
+		tag_index[tag].init(tag_count[tag], cpMap, tag);
+	}
+
+	// Initialize hashTab to a generous power-of-two size.
+	uint32_t pow2 = 1;
+	uint32_t target = maxentries + maxentries / 2; // 60% full
+	while (pow2 < target)
+		pow2 <<= 1;
+	hashTab = U_NEW(entry *, hashTabLength = pow2);
+}
+
+static byte *store_Utf8_char(byte *cp, unsigned short ch)
+{
+	if (ch >= 0x001 && ch <= 0x007F)
+	{
+		*cp++ = (byte)ch;
+	}
+	else if (ch <= 0x07FF)
+	{
+		*cp++ = (byte)(0xC0 | ((ch >> 6) & 0x1F));
+		*cp++ = (byte)(0x80 | ((ch >> 0) & 0x3F));
+	}
+	else
+	{
+		*cp++ = (byte)(0xE0 | ((ch >> 12) & 0x0F));
+		*cp++ = (byte)(0x80 | ((ch >> 6) & 0x3F));
+		*cp++ = (byte)(0x80 | ((ch >> 0) & 0x3F));
+	}
+	return cp;
+}
+
+static byte *skip_Utf8_chars(byte *cp, int len)
+{
+	for (;; cp++)
+	{
+		int ch = *cp & 0xFF;
+		if ((ch & 0xC0) != 0x80)
+		{
+			if (len-- == 0)
+				return cp;
+			if (ch < 0x80 && len == 0)
+				return cp + 1;
+		}
+	}
+}
+
+static int compare_Utf8_chars(bytes &b1, bytes &b2)
+{
+	int l1 = (int)b1.len;
+	int l2 = (int)b2.len;
+	int l0 = (l1 < l2) ? l1 : l2;
+	byte *p1 = b1.ptr;
+	byte *p2 = b2.ptr;
+	int c0 = 0;
+	for (int i = 0; i < l0; i++)
+	{
+		int c1 = p1[i] & 0xFF;
+		int c2 = p2[i] & 0xFF;
+		if (c1 != c2)
+		{
+			// Before returning the obvious answer,
+			// check to see if c1 or c2 is part of a 0x0000,
+			// which encodes as {0xC0,0x80}.  The 0x0000 is the
+			// lowest-sorting Java char value, and yet it encodes
+			// as if it were the first char after 0x7F, which causes
+			// strings containing nulls to sort too high.  All other
+			// comparisons are consistent between Utf8 and Java chars.
+			if (c1 == 0xC0 && (p1[i + 1] & 0xFF) == 0x80)
+				c1 = 0;
+			if (c2 == 0xC0 && (p2[i + 1] & 0xFF) == 0x80)
+				c2 = 0;
+			if (c0 == 0xC0)
+			{
+				assert(((c1 | c2) & 0xC0) == 0x80); // c1 & c2 are extension chars
+				if (c1 == 0x80)
+					c1 = 0; // will sort below c2
+				if (c2 == 0x80)
+					c2 = 0; // will sort below c1
+			}
+			return c1 - c2;
+		}
+		c0 = c1; // save away previous char
+	}
+	// common prefix is identical; return length difference if any
+	return l1 - l2;
+}
+
+// Cf. PackageReader.readUtf8Bands
+void unpacker::read_Utf8_values(entry *cpMap, int len)
+{
+	// Implicit first Utf8 string is the empty string.
+	enum
+	{
+		// certain bands begin with implicit zeroes
+		PREFIX_SKIP_2 = 2,
+		SUFFIX_SKIP_1 = 1
+	};
+
+	int i;
+
+	// First band:  Read lengths of shared prefixes.
+	if (len > PREFIX_SKIP_2)
+		cp_Utf8_prefix.readData(len - PREFIX_SKIP_2);
+
+	// Second band:  Read lengths of unshared suffixes:
+	if (len > SUFFIX_SKIP_1)
+		cp_Utf8_suffix.readData(len - SUFFIX_SKIP_1);
+
+	bytes *allsuffixes = T_NEW(bytes, len);
+
+	int nbigsuf = 0;
+	fillbytes charbuf; // buffer to allocate small strings
+	charbuf.init();
+
+	// Third band:  Read the char values in the unshared suffixes:
+	cp_Utf8_chars.readData(cp_Utf8_suffix.getIntTotal());
+	for (i = 0; i < len; i++)
+	{
+		int suffix = (i < SUFFIX_SKIP_1) ? 0 : cp_Utf8_suffix.getInt();
+		if (suffix < 0)
+		{
+			unpack_abort("bad utf8 suffix");
+		}
+		if (suffix == 0 && i >= SUFFIX_SKIP_1)
+		{
+			// chars are packed in cp_Utf8_big_chars
+			nbigsuf += 1;
+			continue;
+		}
+		bytes &chars = allsuffixes[i];
+		uint32_t size3 = suffix * 3; // max Utf8 length
+		bool isMalloc = (suffix > SMALL);
+		if (isMalloc)
+		{
+			chars.malloc(size3);
+		}
+		else
+		{
+			if (!charbuf.canAppend(size3 + 1))
+			{
+				assert(charbuf.allocated == 0 || tmallocs.contains(charbuf.base()));
+				charbuf.init(CHUNK); // Reset to new buffer.
+				tmallocs.add(charbuf.base());
+			}
+			chars.set(charbuf.grow(size3 + 1), size3);
+		}
+
+		byte *chp = chars.ptr;
+		for (int j = 0; j < suffix; j++)
+		{
+			unsigned short ch = cp_Utf8_chars.getInt();
+			chp = store_Utf8_char(chp, ch);
+		}
+		// shrink to fit:
+		if (isMalloc)
+		{
+			chars.realloc(chp - chars.ptr);
+			tmallocs.add(chars.ptr); // free it later
+		}
+		else
+		{
+			int shrink = (int)(chars.limit() - chp);
+			chars.len -= shrink;
+			charbuf.b.len -= shrink; // ungrow to reclaim buffer space
+			// Note that we did not reclaim the final '\0'.
+			assert(chars.limit() == charbuf.limit() - 1);
+			assert(strlen((char *)chars.ptr) == chars.len);
+		}
+	}
+	// cp_Utf8_chars.done();
+
+	// Fourth band:  Go back and size the specially packed strings.
+	int maxlen = 0;
+	cp_Utf8_big_suffix.readData(nbigsuf);
+	cp_Utf8_suffix.rewind();
+	for (i = 0; i < len; i++)
+	{
+		int suffix = (i < SUFFIX_SKIP_1) ? 0 : cp_Utf8_suffix.getInt();
+		int prefix = (i < PREFIX_SKIP_2) ? 0 : cp_Utf8_prefix.getInt();
+		if (prefix < 0 || prefix + suffix < 0)
+		{
+			unpack_abort("bad utf8 prefix");
+		}
+		bytes &chars = allsuffixes[i];
+		if (suffix == 0 && i >= SUFFIX_SKIP_1)
+		{
+			suffix = cp_Utf8_big_suffix.getInt();
+			assert(chars.ptr == nullptr);
+			chars.len = suffix; // just a momentary hack
+		}
+		else
+		{
+			assert(chars.ptr != nullptr);
+		}
+		if (maxlen < prefix + suffix)
+		{
+			maxlen = prefix + suffix;
+		}
+	}
+	// cp_Utf8_suffix.done();      // will use allsuffixes[i].len (ptr!=nullptr)
+	// cp_Utf8_big_suffix.done();  // will use allsuffixes[i].len
+
+	// Fifth band(s):  Get the specially packed characters.
+	cp_Utf8_big_suffix.rewind();
+	for (i = 0; i < len; i++)
+	{
+		bytes &chars = allsuffixes[i];
+		if (chars.ptr != nullptr)
+			continue;				// already input
+		int suffix = (int)chars.len; // pick up the hack
+		uint32_t size3 = suffix * 3;
+		if (suffix == 0)
+			continue; // done with empty string
+		chars.malloc(size3);
+		byte *chp = chars.ptr;
+		band saved_band = cp_Utf8_big_chars;
+		cp_Utf8_big_chars.readData(suffix);
+		for (int j = 0; j < suffix; j++)
+		{
+			unsigned short ch = cp_Utf8_big_chars.getInt();
+			chp = store_Utf8_char(chp, ch);
+		}
+		chars.realloc(chp - chars.ptr);
+		tmallocs.add(chars.ptr); // free it later
+		// cp_Utf8_big_chars.done();
+		cp_Utf8_big_chars = saved_band; // reset the band for the next string
+	}
+	cp_Utf8_big_chars.readData(0); // zero chars
+								   // cp_Utf8_big_chars.done();
+
+	// Finally, sew together all the prefixes and suffixes.
+	bytes bigbuf;
+	bigbuf.malloc(maxlen * 3 + 1); // max Utf8 length, plus slop for nullptr
+	int prevlen = 0;			   // previous string length (in chars)
+	tmallocs.add(bigbuf.ptr);	  // free after this block
+	cp_Utf8_prefix.rewind();
+	for (i = 0; i < len; i++)
+	{
+		bytes &chars = allsuffixes[i];
+		int prefix = (i < PREFIX_SKIP_2) ? 0 : cp_Utf8_prefix.getInt();
+		int suffix = (int)chars.len;
+		byte *fillp;
+		// by induction, the buffer is already filled with the prefix
+		// make sure the prefix value is not corrupted, though:
+		if (prefix > prevlen)
+		{
+			unpack_abort("utf8 prefix overflow");
+			return;
+		}
+		fillp = skip_Utf8_chars(bigbuf.ptr, prefix);
+		// copy the suffix into the same buffer:
+		fillp = chars.writeTo(fillp);
+		assert(bigbuf.inBounds(fillp));
+		*fillp = 0; // bigbuf must contain a well-formed Utf8 string
+		int length = (int)(fillp - bigbuf.ptr);
+		bytes &value = cpMap[i].value.b;
+		value.set(U_NEW(byte, add_size(length, 1)), length);
+		value.copyFrom(bigbuf.ptr, length);
+		// Index all Utf8 strings
+		entry *&htref = cp.hashTabRef(CONSTANT_Utf8, value);
+		if (htref == nullptr)
+		{
+			// Note that if two identical strings are transmitted,
+			// the first is taken to be the canonical one.
+			htref = &cpMap[i];
+		}
+		prevlen = prefix + suffix;
+	}
+	// cp_Utf8_prefix.done();
+
+	// Free intermediate buffers.
+	free_temps();
+}
+
+void unpacker::read_single_words(band &cp_band, entry *cpMap, int len)
+{
+	cp_band.readData(len);
+	for (int i = 0; i < len; i++)
+	{
+		cpMap[i].value.i = cp_band.getInt(); // coding handles signs OK
+	}
+}
+
+void unpacker::read_double_words(band &cp_bands, entry *cpMap, int len)
+{
+	band &cp_band_hi = cp_bands;
+	band &cp_band_lo = cp_bands.nextBand();
+	cp_band_hi.readData(len);
+	cp_band_lo.readData(len);
+	for (int i = 0; i < len; i++)
+	{
+		cpMap[i].value.l = cp_band_hi.getLong(cp_band_lo, true);
+	}
+	// cp_band_hi.done();
+	// cp_band_lo.done();
+}
+
+void unpacker::read_single_refs(band &cp_band, byte refTag, entry *cpMap, int len)
+{
+	assert(refTag == CONSTANT_Utf8);
+	cp_band.setIndexByTag(refTag);
+	cp_band.readData(len);
+	int indexTag = (cp_band.bn == e_cp_Class) ? CONSTANT_Class : 0;
+	for (int i = 0; i < len; i++)
+	{
+		entry &e = cpMap[i];
+		e.refs = U_NEW(entry *, e.nrefs = 1);
+		entry *utf = cp_band.getRef();
+		e.refs[0] = utf;
+		e.value.b = utf->value.b; // copy value of Utf8 string to self
+		if (indexTag != 0)
+		{
+			// Maintain cross-reference:
+			entry *&htref = cp.hashTabRef(indexTag, e.value.b);
+			if (htref == nullptr)
+			{
+				// Note that if two identical classes are transmitted,
+				// the first is taken to be the canonical one.
+				htref = &e;
+			}
+		}
+	}
+	// cp_band.done();
+}
+
+void unpacker::read_double_refs(band &cp_band, byte ref1Tag, byte ref2Tag, entry *cpMap,
+								int len)
+{
+	band &cp_band1 = cp_band;
+	band &cp_band2 = cp_band.nextBand();
+	cp_band1.setIndexByTag(ref1Tag);
+	cp_band2.setIndexByTag(ref2Tag);
+	cp_band1.readData(len);
+	cp_band2.readData(len);
+	for (int i = 0; i < len; i++)
+	{
+		entry &e = cpMap[i];
+		e.refs = U_NEW(entry *, e.nrefs = 2);
+		e.refs[0] = cp_band1.getRef();
+		e.refs[1] = cp_band2.getRef();
+	}
+	// cp_band1.done();
+	// cp_band2.done();
+}
+
+// Cf. PackageReader.readSignatureBands
+void unpacker::read_signature_values(entry *cpMap, int len)
+{
+	cp_Signature_form.setIndexByTag(CONSTANT_Utf8);
+	cp_Signature_form.readData(len);
+	int ncTotal = 0;
+	int i;
+	for (i = 0; i < len; i++)
+	{
+		entry &e = cpMap[i];
+		entry &form = *cp_Signature_form.getRef();
+		int nc = 0;
+
+		for (const char *ncp = form.utf8String(); *ncp; ncp++)
+		{
+			if (*ncp == 'L')
+				nc++;
+		}
+
+		ncTotal += nc;
+		e.refs = U_NEW(entry *, cpMap[i].nrefs = 1 + nc);
+		e.refs[0] = &form;
+	}
+	// cp_Signature_form.done();
+	cp_Signature_classes.setIndexByTag(CONSTANT_Class);
+	cp_Signature_classes.readData(ncTotal);
+	for (i = 0; i < len; i++)
+	{
+		entry &e = cpMap[i];
+		for (int j = 1; j < e.nrefs; j++)
+		{
+			e.refs[j] = cp_Signature_classes.getRef();
+		}
+	}
+	// cp_Signature_classes.done();
+}
+
+// Cf. PackageReader.readConstantPool
+void unpacker::read_cp()
+{
+	int i;
+
+	for (int k = 0; k < (int)N_TAGS_IN_ORDER; k++)
+	{
+		byte tag = TAGS_IN_ORDER[k];
+		int len = cp.tag_count[tag];
+		int base = cp.tag_base[tag];
+
+		entry *cpMap = &cp.entries[base];
+		for (i = 0; i < len; i++)
+		{
+			cpMap[i].tag = tag;
+			cpMap[i].inord = i;
+		}
+
+		switch (tag)
+		{
+		case CONSTANT_Utf8:
+			read_Utf8_values(cpMap, len);
+			break;
+		case CONSTANT_Integer:
+			read_single_words(cp_Int, cpMap, len);
+			break;
+		case CONSTANT_Float:
+			read_single_words(cp_Float, cpMap, len);
+			break;
+		case CONSTANT_Long:
+			read_double_words(cp_Long_hi /*& cp_Long_lo*/, cpMap, len);
+			break;
+		case CONSTANT_Double:
+			read_double_words(cp_Double_hi /*& cp_Double_lo*/, cpMap, len);
+			break;
+		case CONSTANT_String:
+			read_single_refs(cp_String, CONSTANT_Utf8, cpMap, len);
+			break;
+		case CONSTANT_Class:
+			read_single_refs(cp_Class, CONSTANT_Utf8, cpMap, len);
+			break;
+		case CONSTANT_Signature:
+			read_signature_values(cpMap, len);
+			break;
+		case CONSTANT_NameandType:
+			read_double_refs(cp_Descr_name /*& cp_Descr_type*/, CONSTANT_Utf8,
+							 CONSTANT_Signature, cpMap, len);
+			break;
+		case CONSTANT_Fieldref:
+			read_double_refs(cp_Field_class /*& cp_Field_desc*/, CONSTANT_Class,
+							 CONSTANT_NameandType, cpMap, len);
+			break;
+		case CONSTANT_Methodref:
+			read_double_refs(cp_Method_class /*& cp_Method_desc*/, CONSTANT_Class,
+							 CONSTANT_NameandType, cpMap, len);
+			break;
+		case CONSTANT_InterfaceMethodref:
+			read_double_refs(cp_Imethod_class /*& cp_Imethod_desc*/, CONSTANT_Class,
+							 CONSTANT_NameandType, cpMap, len);
+			break;
+		default:
+			assert(false);
+			break;
+		}
+	}
+
+	cp.expandSignatures();
+	cp.initMemberIndexes();
+
+#define SNAME(n, s) #s "\0"
+	const char *symNames = (ALL_ATTR_DO(SNAME) "<init>");
+#undef SNAME
+
+	for (int sn = 0; sn < constant_pool::s_LIMIT; sn++)
+	{
+		assert(symNames[0] >= '0' && symNames[0] <= 'Z'); // sanity
+		bytes name;
+		name.set(symNames);
+		if (name.len > 0 && name.ptr[0] != '0')
+		{
+			cp.sym[sn] = cp.ensureUtf8(name);
+		}
+		symNames += name.len + 1; // skip trailing nullptr to next name
+	}
+
+	band::initIndexes(this);
+}
+
+static band *no_bands[] = {nullptr}; // shared empty body
+
+inline band &unpacker::attr_definitions::fixed_band(int e_class_xxx)
+{
+	return u->all_bands[xxx_flags_hi_bn + (e_class_xxx - e_class_flags_hi)];
+}
+inline band &unpacker::attr_definitions::xxx_flags_hi()
+{
+	return fixed_band(e_class_flags_hi);
+}
+inline band &unpacker::attr_definitions::xxx_flags_lo()
+{
+	return fixed_band(e_class_flags_lo);
+}
+inline band &unpacker::attr_definitions::xxx_attr_count()
+{
+	return fixed_band(e_class_attr_count);
+}
+inline band &unpacker::attr_definitions::xxx_attr_indexes()
+{
+	return fixed_band(e_class_attr_indexes);
+}
+inline band &unpacker::attr_definitions::xxx_attr_calls()
+{
+	return fixed_band(e_class_attr_calls);
+}
+
+inline unpacker::layout_definition *
+unpacker::attr_definitions::defineLayout(int idx, entry *nameEntry, const char *layout)
+{
+	const char *name = nameEntry->value.b.strval();
+	layout_definition *lo = defineLayout(idx, name, layout);
+	lo->nameEntry = nameEntry;
+	return lo;
+}
+
+unpacker::layout_definition *unpacker::attr_definitions::defineLayout(int idx, const char *name,
+																	  const char *layout)
+{
+	assert(flag_limit != 0); // must be set up already
+	if (idx >= 0)
+	{
+		// Fixed attr.
+		if (idx >= (int)flag_limit)
+			unpack_abort("attribute index too large");
+		if (isRedefined(idx))
+			unpack_abort("redefined attribute index");
+		redef |= ((uint64_t)1 << idx);
+	}
+	else
+	{
+		idx = flag_limit + overflow_count.length();
+		overflow_count.add(0); // make a new counter
+	}
+	layout_definition *lo = U_NEW(layout_definition, 1);
+	lo->idx = idx;
+	lo->name = name;
+	lo->layout = layout;
+	for (int adds = (idx + 1) - layouts.length(); adds > 0; adds--)
+	{
+		layouts.add(nullptr);
+	}
+	layouts.get(idx) = lo;
+	return lo;
+}
+
+band **unpacker::attr_definitions::buildBands(unpacker::layout_definition *lo)
+{
+	int i;
+	if (lo->elems != nullptr)
+		return lo->bands();
+	if (lo->layout[0] == '\0')
+	{
+		lo->elems = no_bands;
+	}
+	else
+	{
+		// Create bands for this attribute by parsing the layout.
+		bool hasCallables = lo->hasCallables();
+		bands_made = 0x10000; // base number for bands made
+		const char *lp = lo->layout;
+		lp = parseLayout(lp, lo->elems, -1);
+		if (lp[0] != '\0' || band_stack.length() > 0)
+		{
+			unpack_abort("garbage at end of layout");
+		}
+		band_stack.popTo(0);
+
+		// Fix up callables to point at their callees.
+		band **bands = lo->elems;
+		assert(bands == lo->bands());
+		int num_callables = 0;
+		if (hasCallables)
+		{
+			while (bands[num_callables] != nullptr)
+			{
+				if (bands[num_callables]->le_kind != EK_CBLE)
+				{
+					unpack_abort("garbage mixed with callables");
+					break;
+				}
+				num_callables += 1;
+			}
+		}
+		for (i = 0; i < calls_to_link.length(); i++)
+		{
+			band &call = *(band *)calls_to_link.get(i);
+			assert(call.le_kind == EK_CALL);
+			// Determine the callee.
+			int call_num = call.le_len;
+			if (call_num < 0 || call_num >= num_callables)
+			{
+				unpack_abort("bad call in layout");
+				break;
+			}
+			band &cble = *bands[call_num];
+			// Link the call to it.
+			call.le_body[0] = &cble;
+			// Distinguish backward calls and callables:
+			assert(cble.le_kind == EK_CBLE);
+			// FIXME: hit this one
+			// assert(cble.le_len == call_num);
+			cble.le_back |= call.le_back;
+		}
+		calls_to_link.popTo(0);
+	}
+	return lo->elems;
+}
+
+/* attribute layout language parser
+
+  attribute_layout:
+		( layout_element )* | ( callable )+
+  layout_element:
+		( integral | replication | union | call | reference )
+
+  callable:
+		'[' body ']'
+  body:
+		( layout_element )+
+
+  integral:
+		( unsigned_int | signed_int | bc_index | bc_offset | flag )
+  unsigned_int:
+		uint_type
+  signed_int:
+		'S' uint_type
+  any_int:
+		( unsigned_int | signed_int )
+  bc_index:
+		( 'P' uint_type | 'PO' uint_type )
+  bc_offset:
+		'O' any_int
+  flag:
+		'F' uint_type
+  uint_type:
+		( 'B' | 'H' | 'I' | 'V' )
+
+  replication:
+		'N' uint_type '[' body ']'
+
+  union:
+		'T' any_int (union_case)* '(' ')' '[' (body)? ']'
+  union_case:
+		'(' union_case_tag (',' union_case_tag)* ')' '[' (body)? ']'
+  union_case_tag:
+		( numeral | numeral '-' numeral )
+  call:
+		'(' numeral ')'
+
+  reference:
+		reference_type ( 'N' )? uint_type
+  reference_type:
+		( constant_ref | schema_ref | utf8_ref | untyped_ref )
+  constant_ref:
+		( 'KI' | 'KJ' | 'KF' | 'KD' | 'KS' | 'KQ' )
+  schema_ref:
+		( 'RC' | 'RS' | 'RD' | 'RF' | 'RM' | 'RI' )
+  utf8_ref:
+		'RU'
+  untyped_ref:
+		'RQ'
+
+  numeral:
+		'(' ('-')? (digit)+ ')'
+  digit:
+		( '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' )
+
+*/
+
+const char *unpacker::attr_definitions::parseIntLayout(const char *lp, band *&res, byte le_kind,
+													   bool can_be_signed)
+{
+	band *b = U_NEW(band, 1);
+	char le = *lp++;
+	int spec = UNSIGNED5_spec;
+	if (le == 'S' && can_be_signed)
+	{
+		// Note:  This is the last use of sign.  There is no 'EF_SIGN'.
+		spec = SIGNED5_spec;
+		le = *lp++;
+	}
+	else if (le == 'B')
+	{
+		spec = BYTE1_spec; // unsigned byte
+	}
+	b->init(u, bands_made++, spec);
+	b->le_kind = le_kind;
+	int le_len = 0;
+	switch (le)
+	{
+	case 'B':
+		le_len = 1;
+		break;
+	case 'H':
+		le_len = 2;
+		break;
+	case 'I':
+		le_len = 4;
+		break;
+	case 'V':
+		le_len = 0;
+		break;
+	default:
+		unpack_abort("bad layout element");
+	}
+	b->le_len = le_len;
+	band_stack.add(b);
+	res = b;
+	return lp;
+}
+
+const char *unpacker::attr_definitions::parseNumeral(const char *lp, int &res)
+{
+	bool sgn = false;
+	if (*lp == '0')
+	{
+		res = 0;
+		return lp + 1;
+	} // special case '0'
+	if (*lp == '-')
+	{
+		sgn = true;
+		lp++;
+	}
+	const char *dp = lp;
+	int con = 0;
+	while (*dp >= '0' && *dp <= '9')
+	{
+		int con0 = con;
+		con *= 10;
+		con += (*dp++) - '0';
+		if (con <= con0)
+		{
+			con = -1;
+			break;
+		} //  numeral overflow
+	}
+	if (lp == dp)
+	{
+		unpack_abort("missing numeral in layout");
+	}
+	lp = dp;
+	if (con < 0 && !(sgn && con == -con))
+	{
+		// (Portability note:  Misses the error if int is not 32 bits.)
+		unpack_abort("numeral overflow");
+	}
+	if (sgn)
+		con = -con;
+	res = con;
+	return lp;
+}
+
+band **unpacker::attr_definitions::popBody(int bs_base)
+{
+	// Return everything that was pushed, as a nullptr-terminated pointer array.
+	int bs_limit = band_stack.length();
+	if (bs_base == bs_limit)
+	{
+		return no_bands;
+	}
+	else
+	{
+		int nb = bs_limit - bs_base;
+		band **res = U_NEW(band *, add_size(nb, 1));
+		for (int i = 0; i < nb; i++)
+		{
+			band *b = (band *)band_stack.get(bs_base + i);
+			res[i] = b;
+		}
+		band_stack.popTo(bs_base);
+		return res;
+	}
+}
+
+const char *unpacker::attr_definitions::parseLayout(const char *lp, band **&res, int curCble)
+{
+	int bs_base = band_stack.length();
+	bool top_level = (bs_base == 0);
+	band *b;
+	enum
+	{
+		can_be_signed = true
+	}; // optional arg to parseIntLayout
+
+	for (bool done = false; !done;)
+	{
+		switch (*lp++)
+		{
+		case 'B':
+		case 'H':
+		case 'I':
+		case 'V': // unsigned_int
+		case 'S': // signed_int
+			--lp; // reparse
+		case 'F':
+			lp = parseIntLayout(lp, b, EK_INT);
+			break;
+		case 'P':
+		{
+			int le_bci = EK_BCI;
+			if (*lp == 'O')
+			{
+				++lp;
+				le_bci = EK_BCID;
+			}
+			assert(*lp != 'S'); // no PSH, etc.
+			lp = parseIntLayout(lp, b, EK_INT);
+			b->le_bci = le_bci;
+			if (le_bci == EK_BCI)
+				b->defc = coding::findBySpec(BCI5_spec);
+			else
+				b->defc = coding::findBySpec(BRANCH5_spec);
+		}
+		break;
+		case 'O':
+			lp = parseIntLayout(lp, b, EK_INT, can_be_signed);
+			b->le_bci = EK_BCO;
+			b->defc = coding::findBySpec(BRANCH5_spec);
+			break;
+		case 'N': // replication: 'N' uint32_t '[' elem ... ']'
+			lp = parseIntLayout(lp, b, EK_REPL);
+			assert(*lp == '[');
+			++lp;
+			lp = parseLayout(lp, b->le_body, curCble);
+			break;
+		case 'T': // union: 'T' any_int union_case* '(' ')' '[' body ']'
+			lp = parseIntLayout(lp, b, EK_UN, can_be_signed);
+			{
+				int union_base = band_stack.length();
+				for (;;)
+				{ // for each case
+					band &k_case = *U_NEW(band, 1);
+					band_stack.add(&k_case);
+					k_case.le_kind = EK_CASE;
+					k_case.bn = bands_made++;
+					if (*lp++ != '(')
+					{
+						unpack_abort("bad union case");
+						return "";
+					}
+					if (*lp++ != ')')
+					{
+						--lp; // reparse
+						// Read some case values.  (Use band_stack for temp. storage.)
+						int case_base = band_stack.length();
+						for (;;)
+						{
+							int caseval = 0;
+							lp = parseNumeral(lp, caseval);
+							band_stack.add((void *)(size_t)caseval);
+							if (*lp == '-')
+							{
+								// new in version 160, allow (1-5) for (1,2,3,4,5)
+								if (u->majver < JAVA6_PACKAGE_MAJOR_VERSION)
+								{
+									unpack_abort(
+										"bad range in union case label (old archive format)");
+									return "";
+								}
+								int caselimit = caseval;
+								lp++;
+								lp = parseNumeral(lp, caselimit);
+								if (caseval >= caselimit ||
+									(uint32_t)(caselimit - caseval) > 0x10000)
+								{
+									// Note:  0x10000 is arbitrary implementation restriction.
+									// We can remove it later if it's important to.
+									unpack_abort("bad range in union case label");
+								}
+								for (;;)
+								{
+									++caseval;
+									band_stack.add((void *)(size_t)caseval);
+									if (caseval == caselimit)
+										break;
+								}
+							}
+							if (*lp != ',')
+								break;
+							lp++;
+						}
+						if (*lp++ != ')')
+						{
+							unpack_abort("bad case label");
+						}
+						// save away the case labels
+						int ntags = band_stack.length() - case_base;
+						int *tags = U_NEW(int, add_size(ntags, 1));
+						k_case.le_casetags = tags;
+						*tags++ = ntags;
+						for (int i = 0; i < ntags; i++)
+						{
+							*tags++ = ptrlowbits(band_stack.get(case_base + i));
+						}
+						band_stack.popTo(case_base);
+					}
+					// Got le_casetags.  Now grab the body.
+					assert(*lp == '[');
+					++lp;
+					lp = parseLayout(lp, k_case.le_body, curCble);
+					if (k_case.le_casetags == nullptr)
+						break; // done
+				}
+				b->le_body = popBody(union_base);
+			}
+			break;
+		case '(': // call: '(' -?NN* ')'
+		{
+			band &call = *U_NEW(band, 1);
+			band_stack.add(&call);
+			call.le_kind = EK_CALL;
+			call.bn = bands_made++;
+			call.le_body = U_NEW(band *, 2); // fill in later
+			int call_num = 0;
+			lp = parseNumeral(lp, call_num);
+			call.le_back = (call_num <= 0);
+			call_num += curCble;	// numeral is self-relative offset
+			call.le_len = call_num; // use le_len as scratch
+			calls_to_link.add(&call);
+			if (*lp++ != ')')
+			{
+				unpack_abort("bad call label");
+			}
+		}
+		break;
+		case 'K': // reference_type: constant_ref
+		case 'R': // reference_type: schema_ref
+		{
+			int ixTag = CONSTANT_None;
+			if (lp[-1] == 'K')
+			{
+				switch (*lp++)
+				{
+				case 'I':
+					ixTag = CONSTANT_Integer;
+					break;
+				case 'J':
+					ixTag = CONSTANT_Long;
+					break;
+				case 'F':
+					ixTag = CONSTANT_Float;
+					break;
+				case 'D':
+					ixTag = CONSTANT_Double;
+					break;
+				case 'S':
+					ixTag = CONSTANT_String;
+					break;
+				case 'Q':
+					ixTag = CONSTANT_Literal;
+					break;
+				}
+			}
+			else
+			{
+				switch (*lp++)
+				{
+				case 'C':
+					ixTag = CONSTANT_Class;
+					break;
+				case 'S':
+					ixTag = CONSTANT_Signature;
+					break;
+				case 'D':
+					ixTag = CONSTANT_NameandType;
+					break;
+				case 'F':
+					ixTag = CONSTANT_Fieldref;
+					break;
+				case 'M':
+					ixTag = CONSTANT_Methodref;
+					break;
+				case 'I':
+					ixTag = CONSTANT_InterfaceMethodref;
+					break;
+				case 'U':
+					ixTag = CONSTANT_Utf8;
+					break; // utf8_ref
+				case 'Q':
+					ixTag = CONSTANT_All;
+					break; // untyped_ref
+				}
+			}
+			if (ixTag == CONSTANT_None)
+			{
+				unpack_abort("bad reference layout");
+				break;
+			}
+			bool nullOK = false;
+			if (*lp == 'N')
+			{
+				nullOK = true;
+				lp++;
+			}
+			lp = parseIntLayout(lp, b, EK_REF);
+			b->defc = coding::findBySpec(UNSIGNED5_spec);
+			b->initRef(ixTag, nullOK);
+		}
+		break;
+		case '[':
+		{
+			// [callable1][callable2]...
+			if (!top_level)
+			{
+				unpack_abort("bad nested callable");
+				break;
+			}
+			curCble += 1;
+			band &cble = *U_NEW(band, 1);
+			band_stack.add(&cble);
+			cble.le_kind = EK_CBLE;
+			cble.bn = bands_made++;
+			lp = parseLayout(lp, cble.le_body, curCble);
+		}
+		break;
+		case ']':
+			// Hit a closing brace.  This ends whatever body we were in.
+			done = true;
+			break;
+		case '\0':
+			// Hit a nullptr.  Also ends the (top-level) body.
+			--lp; // back up, so caller can see the nullptr also
+			done = true;
+			break;
+		default:
+			unpack_abort("bad layout");
+		}
+	}
+
+	// Return the accumulated bands:
+	res = popBody(bs_base);
+	return lp;
+}
+
+void unpacker::read_attr_defs()
+{
+	int i;
+
+	// Tell each AD which attrc it is and where its fixed flags are:
+	attr_defs[ATTR_CONTEXT_CLASS].attrc = ATTR_CONTEXT_CLASS;
+	attr_defs[ATTR_CONTEXT_CLASS].xxx_flags_hi_bn = e_class_flags_hi;
+	attr_defs[ATTR_CONTEXT_FIELD].attrc = ATTR_CONTEXT_FIELD;
+	attr_defs[ATTR_CONTEXT_FIELD].xxx_flags_hi_bn = e_field_flags_hi;
+	attr_defs[ATTR_CONTEXT_METHOD].attrc = ATTR_CONTEXT_METHOD;
+	attr_defs[ATTR_CONTEXT_METHOD].xxx_flags_hi_bn = e_method_flags_hi;
+	attr_defs[ATTR_CONTEXT_CODE].attrc = ATTR_CONTEXT_CODE;
+	attr_defs[ATTR_CONTEXT_CODE].xxx_flags_hi_bn = e_code_flags_hi;
+
+	// Decide whether bands for the optional high flag words are present.
+	attr_defs[ATTR_CONTEXT_CLASS]
+		.setHaveLongFlags((archive_options & AO_HAVE_CLASS_FLAGS_HI) != 0);
+	attr_defs[ATTR_CONTEXT_FIELD]
+		.setHaveLongFlags((archive_options & AO_HAVE_FIELD_FLAGS_HI) != 0);
+	attr_defs[ATTR_CONTEXT_METHOD]
+		.setHaveLongFlags((archive_options & AO_HAVE_METHOD_FLAGS_HI) != 0);
+	attr_defs[ATTR_CONTEXT_CODE]
+		.setHaveLongFlags((archive_options & AO_HAVE_CODE_FLAGS_HI) != 0);
+
+	// Set up built-in attrs.
+	// (The simple ones are hard-coded.  The metadata layouts are not.)
+	const char *md_layout = (
+// parameter annotations:
+#define MDL0 "[NB[(1)]]"
+		MDL0
+// annotations:
+#define MDL1                                                                                   \
+	"[NH[(1)]]"                                                                                \
+	"[RSHNH[RUH(1)]]"
+			MDL1
+		// member_value:
+		"[TB"
+		"(66,67,73,83,90)[KIH]"
+		"(68)[KDH]"
+		"(70)[KFH]"
+		"(74)[KJH]"
+		"(99)[RSH]"
+		"(101)[RSHRUH]"
+		"(115)[RUH]"
+		"(91)[NH[(0)]]"
+		"(64)["
+		// nested annotation:
+		"RSH"
+		"NH[RUH(0)]"
+		"]"
+		"()[]"
+		"]");
+
+	const char *md_layout_P = md_layout;
+	const char *md_layout_A = md_layout + strlen(MDL0);
+	const char *md_layout_V = md_layout + strlen(MDL0 MDL1);
+	assert(0 == strncmp(&md_layout_A[-3], ")]][", 4));
+	assert(0 == strncmp(&md_layout_V[-3], ")]][", 4));
+
+	for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
+	{
+		attr_definitions &ad = attr_defs[i];
+		ad.defineLayout(X_ATTR_RuntimeVisibleAnnotations, "RuntimeVisibleAnnotations",
+						md_layout_A);
+		ad.defineLayout(X_ATTR_RuntimeInvisibleAnnotations, "RuntimeInvisibleAnnotations",
+						md_layout_A);
+		if (i != ATTR_CONTEXT_METHOD)
+			continue;
+		ad.defineLayout(METHOD_ATTR_RuntimeVisibleParameterAnnotations,
+						"RuntimeVisibleParameterAnnotations", md_layout_P);
+		ad.defineLayout(METHOD_ATTR_RuntimeInvisibleParameterAnnotations,
+						"RuntimeInvisibleParameterAnnotations", md_layout_P);
+		ad.defineLayout(METHOD_ATTR_AnnotationDefault, "AnnotationDefault", md_layout_V);
+	}
+
+	attr_definition_headers.readData(attr_definition_count);
+	attr_definition_name.readData(attr_definition_count);
+	attr_definition_layout.readData(attr_definition_count);
+
+// Initialize correct predef bits, to distinguish predefs from new defs.
+#define ORBIT(n, s) | ((uint64_t)1 << n)
+	attr_defs[ATTR_CONTEXT_CLASS].predef = (0 X_ATTR_DO(ORBIT) CLASS_ATTR_DO(ORBIT));
+	attr_defs[ATTR_CONTEXT_FIELD].predef = (0 X_ATTR_DO(ORBIT) FIELD_ATTR_DO(ORBIT));
+	attr_defs[ATTR_CONTEXT_METHOD].predef = (0 X_ATTR_DO(ORBIT) METHOD_ATTR_DO(ORBIT));
+	attr_defs[ATTR_CONTEXT_CODE].predef = (0 O_ATTR_DO(ORBIT) CODE_ATTR_DO(ORBIT));
+#undef ORBIT
+	// Clear out the redef bits, folding them back into predef.
+	for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
+	{
+		attr_defs[i].predef |= attr_defs[i].redef;
+		attr_defs[i].redef = 0;
+	}
+
+	// Now read the transmitted locally defined attrs.
+	// This will set redef bits again.
+	for (i = 0; i < attr_definition_count; i++)
+	{
+		int header = attr_definition_headers.getByte();
+		int attrc = ADH_BYTE_CONTEXT(header);
+		int idx = ADH_BYTE_INDEX(header);
+		entry *name = attr_definition_name.getRef();
+		entry *layout = attr_definition_layout.getRef();
+		attr_defs[attrc].defineLayout(idx, name, layout->value.b.strval());
+	}
+}
+
+#define NO_ENTRY_YET ((entry *)-1)
+
+static bool isDigitString(bytes &x, int beg, int end)
+{
+	if (beg == end)
+		return false; // nullptr string
+	byte *xptr = x.ptr;
+	for (int i = beg; i < end; i++)
+	{
+		char ch = xptr[i];
+		if (!(ch >= '0' && ch <= '9'))
+			return false;
+	}
+	return true;
+}
+
+enum
+{ // constants for parsing class names
+	SLASH_MIN = '.',
+	SLASH_MAX = '/',
+	DOLLAR_MIN = 0,
+	DOLLAR_MAX = '-'};
+
+static int lastIndexOf(int chmin, int chmax, bytes &x, int pos)
+{
+	byte *ptr = x.ptr;
+	for (byte *cp = ptr + pos; --cp >= ptr;)
+	{
+		assert(x.inBounds(cp));
+		if (*cp >= chmin && *cp <= chmax)
+			return (int)(cp - ptr);
+	}
+	return -1;
+}
+
+inner_class *constant_pool::getIC(entry *inner)
+{
+	if (inner == nullptr)
+		return nullptr;
+	assert(inner->tag == CONSTANT_Class);
+	if (inner->inord == NO_INORD)
+		return nullptr;
+	inner_class *ic = ic_index[inner->inord];
+	assert(ic == nullptr || ic->inner == inner);
+	return ic;
+}
+
+inner_class *constant_pool::getFirstChildIC(entry *outer)
+{
+	if (outer == nullptr)
+		return nullptr;
+	assert(outer->tag == CONSTANT_Class);
+	if (outer->inord == NO_INORD)
+		return nullptr;
+	inner_class *ic = ic_child_index[outer->inord];
+	assert(ic == nullptr || ic->outer == outer);
+	return ic;
+}
+
+inner_class *constant_pool::getNextChildIC(inner_class *child)
+{
+	inner_class *ic = child->next_sibling;
+	assert(ic == nullptr || ic->outer == child->outer);
+	return ic;
+}
+
+void unpacker::read_ics()
+{
+	int i;
+	int index_size = cp.tag_count[CONSTANT_Class];
+	inner_class **ic_index = U_NEW(inner_class *, index_size);
+	inner_class **ic_child_index = U_NEW(inner_class *, index_size);
+	cp.ic_index = ic_index;
+	cp.ic_child_index = ic_child_index;
+	ics = U_NEW(inner_class, ic_count);
+	ic_this_class.readData(ic_count);
+	ic_flags.readData(ic_count);
+	// Scan flags to get count of long-form bands.
+	int long_forms = 0;
+	for (i = 0; i < ic_count; i++)
+	{
+		int flags = ic_flags.getInt(); // may be long form!
+		if ((flags & ACC_IC_LONG_FORM) != 0)
+		{
+			long_forms += 1;
+			ics[i].name = NO_ENTRY_YET;
+		}
+		flags &= ~ACC_IC_LONG_FORM;
+		entry *inner = ic_this_class.getRef();
+		uint32_t inord = inner->inord;
+		assert(inord < (uint32_t)cp.tag_count[CONSTANT_Class]);
+		if (ic_index[inord] != nullptr)
+		{
+			unpack_abort("identical inner class");
+			break;
+		}
+		ic_index[inord] = &ics[i];
+		ics[i].inner = inner;
+		ics[i].flags = flags;
+		assert(cp.getIC(inner) == &ics[i]);
+	}
+	// ic_this_class.done();
+	// ic_flags.done();
+	ic_outer_class.readData(long_forms);
+	ic_name.readData(long_forms);
+	for (i = 0; i < ic_count; i++)
+	{
+		if (ics[i].name == NO_ENTRY_YET)
+		{
+			// Long form.
+			ics[i].outer = ic_outer_class.getRefN();
+			ics[i].name = ic_name.getRefN();
+		}
+		else
+		{
+			// Fill in outer and name based on inner.
+			bytes &n = ics[i].inner->value.b;
+			bytes pkgOuter;
+			bytes number;
+			bytes name;
+			// Parse n into pkgOuter and name (and number).
+			int dollar1, dollar2; // pointers to $ in the pattern
+			// parse n = (<pkg>/)*<outer>($<number>)?($<name>)?
+			int nlen = (int)n.len;
+			int pkglen = lastIndexOf(SLASH_MIN, SLASH_MAX, n, nlen) + 1;
+			dollar2 = lastIndexOf(DOLLAR_MIN, DOLLAR_MAX, n, nlen);
+			if (dollar2 < 0)
+			{
+				unpack_abort();
+			}
+			assert(dollar2 >= pkglen);
+			if (isDigitString(n, dollar2 + 1, nlen))
+			{
+				// n = (<pkg>/)*<outer>$<number>
+				number = n.slice(dollar2 + 1, nlen);
+				name.set(nullptr, 0);
+				dollar1 = dollar2;
+			}
+			else if (pkglen < (dollar1 = lastIndexOf(DOLLAR_MIN, DOLLAR_MAX, n, dollar2 - 1)) &&
+					 isDigitString(n, dollar1 + 1, dollar2))
+			{
+				// n = (<pkg>/)*<outer>$<number>$<name>
+				number = n.slice(dollar1 + 1, dollar2);
+				name = n.slice(dollar2 + 1, nlen);
+			}
+			else
+			{
+				// n = (<pkg>/)*<outer>$<name>
+				dollar1 = dollar2;
+				number.set(nullptr, 0);
+				name = n.slice(dollar2 + 1, nlen);
+			}
+			if (number.ptr == nullptr)
+				pkgOuter = n.slice(0, dollar1);
+			else
+				pkgOuter.set(nullptr, 0);
+
+			if (pkgOuter.ptr != nullptr)
+				ics[i].outer = cp.ensureClass(pkgOuter);
+
+			if (name.ptr != nullptr)
+				ics[i].name = cp.ensureUtf8(name);
+		}
+
+		// update child/sibling list
+		if (ics[i].outer != nullptr)
+		{
+			uint32_t outord = ics[i].outer->inord;
+			if (outord != NO_INORD)
+			{
+				assert(outord < (uint32_t)cp.tag_count[CONSTANT_Class]);
+				ics[i].next_sibling = ic_child_index[outord];
+				ic_child_index[outord] = &ics[i];
+			}
+		}
+	}
+	// ic_outer_class.done();
+	// ic_name.done();
+}
+
+void unpacker::read_classes()
+{
+	class_this.readData(class_count);
+	class_super.readData(class_count);
+	class_interface_count.readData(class_count);
+	class_interface.readData(class_interface_count.getIntTotal());
+
+#if 0
+  int i;
+  // Make a little mark on super-classes.
+  for (i = 0; i < class_count; i++) {
+    entry* e = class_super.getRefN();
+    if (e != nullptr)  e->bits |= entry::EB_SUPER;
+  }
+  class_super.rewind();
+#endif
+
+	// Members.
+	class_field_count.readData(class_count);
+	class_method_count.readData(class_count);
+
+	int field_count = class_field_count.getIntTotal();
+	int method_count = class_method_count.getIntTotal();
+
+	field_descr.readData(field_count);
+	read_attrs(ATTR_CONTEXT_FIELD, field_count);
+	method_descr.readData(method_count);
+	read_attrs(ATTR_CONTEXT_METHOD, method_count);
+	read_attrs(ATTR_CONTEXT_CLASS, class_count);
+	read_code_headers();
+}
+
+int unpacker::attr_definitions::predefCount(uint32_t idx)
+{
+	return isPredefined(idx) ? flag_count[idx] : 0;
+}
+
+void unpacker::read_attrs(int attrc, int obj_count)
+{
+	attr_definitions &ad = attr_defs[attrc];
+	assert(ad.attrc == attrc);
+
+	int i, idx, count;
+
+	bool haveLongFlags = ad.haveLongFlags();
+
+	band &xxx_flags_hi = ad.xxx_flags_hi();
+	if (haveLongFlags)
+		xxx_flags_hi.readData(obj_count);
+
+	band &xxx_flags_lo = ad.xxx_flags_lo();
+	xxx_flags_lo.readData(obj_count);
+
+	// pre-scan flags, counting occurrences of each index bit
+	uint64_t indexMask = ad.flagIndexMask(); // which flag bits are index bits?
+	for (i = 0; i < obj_count; i++)
+	{
+		uint64_t indexBits = xxx_flags_hi.getLong(xxx_flags_lo, haveLongFlags);
+		if ((indexBits & ~indexMask) > (ushort) - 1)
+		{
+			unpack_abort("undefined attribute flag bit");
+			return;
+		}
+		indexBits &= indexMask; // ignore classfile flag bits
+		for (idx = 0; indexBits != 0; idx++, indexBits >>= 1)
+		{
+			ad.flag_count[idx] += (int)(indexBits & 1);
+		}
+	}
+	// we'll scan these again later for output:
+	xxx_flags_lo.rewind();
+	xxx_flags_hi.rewind();
+
+	band &xxx_attr_count = ad.xxx_attr_count();
+	// There is one count element for each 1<<16 bit set in flags:
+	xxx_attr_count.readData(ad.predefCount(X_ATTR_OVERFLOW));
+
+	band &xxx_attr_indexes = ad.xxx_attr_indexes();
+	int overflowIndexCount = xxx_attr_count.getIntTotal();
+	xxx_attr_indexes.readData(overflowIndexCount);
+	// pre-scan attr indexes, counting occurrences of each value
+	for (i = 0; i < overflowIndexCount; i++)
+	{
+		idx = xxx_attr_indexes.getInt();
+		if (!ad.isIndex(idx))
+		{
+			unpack_abort("attribute index out of bounds");
+			return;
+		}
+		ad.getCount(idx) += 1;
+	}
+	xxx_attr_indexes.rewind(); // we'll scan it again later for output
+
+	// We will need a backward call count for each used backward callable.
+	int backwardCounts = 0;
+	for (idx = 0; idx < ad.layouts.length(); idx++)
+	{
+		layout_definition *lo = ad.getLayout(idx);
+		if (lo != nullptr && ad.getCount(idx) != 0)
+		{
+			// Build the bands lazily, only when they are used.
+			band **bands = ad.buildBands(lo);
+			if (lo->hasCallables())
+			{
+				for (i = 0; bands[i] != nullptr; i++)
+				{
+					if (bands[i]->le_back)
+					{
+						assert(bands[i]->le_kind == EK_CBLE);
+						backwardCounts += 1;
+					}
+				}
+			}
+		}
+	}
+	ad.xxx_attr_calls().readData(backwardCounts);
+
+	// Read built-in bands.
+	// Mostly, these are hand-coded equivalents to readBandData().
+	switch (attrc)
+	{
+	case ATTR_CONTEXT_CLASS:
+
+		count = ad.predefCount(CLASS_ATTR_SourceFile);
+		class_SourceFile_RUN.readData(count);
+
+		count = ad.predefCount(CLASS_ATTR_EnclosingMethod);
+		class_EnclosingMethod_RC.readData(count);
+		class_EnclosingMethod_RDN.readData(count);
+
+		count = ad.predefCount(X_ATTR_Signature);
+		class_Signature_RS.readData(count);
+
+		ad.readBandData(X_ATTR_RuntimeVisibleAnnotations);
+		ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations);
+
+		count = ad.predefCount(CLASS_ATTR_InnerClasses);
+		class_InnerClasses_N.readData(count);
+
+		count = class_InnerClasses_N.getIntTotal();
+		class_InnerClasses_RC.readData(count);
+		class_InnerClasses_F.readData(count);
+
+		// Drop remaining columns wherever flags are zero:
+		count -= class_InnerClasses_F.getIntCount(0);
+		class_InnerClasses_outer_RCN.readData(count);
+		class_InnerClasses_name_RUN.readData(count);
+
+		count = ad.predefCount(CLASS_ATTR_ClassFile_version);
+		class_ClassFile_version_minor_H.readData(count);
+		class_ClassFile_version_major_H.readData(count);
+		break;
+
+	case ATTR_CONTEXT_FIELD:
+
+		count = ad.predefCount(FIELD_ATTR_ConstantValue);
+		field_ConstantValue_KQ.readData(count);
+
+		count = ad.predefCount(X_ATTR_Signature);
+		field_Signature_RS.readData(count);
+
+		ad.readBandData(X_ATTR_RuntimeVisibleAnnotations);
+		ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations);
+		break;
+
+	case ATTR_CONTEXT_METHOD:
+
+		code_count = ad.predefCount(METHOD_ATTR_Code);
+		// Code attrs are handled very specially below...
+
+		count = ad.predefCount(METHOD_ATTR_Exceptions);
+		method_Exceptions_N.readData(count);
+		count = method_Exceptions_N.getIntTotal();
+		method_Exceptions_RC.readData(count);
+
+		count = ad.predefCount(X_ATTR_Signature);
+		method_Signature_RS.readData(count);
+
+		ad.readBandData(X_ATTR_RuntimeVisibleAnnotations);
+		ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations);
+		ad.readBandData(METHOD_ATTR_RuntimeVisibleParameterAnnotations);
+		ad.readBandData(METHOD_ATTR_RuntimeInvisibleParameterAnnotations);
+		ad.readBandData(METHOD_ATTR_AnnotationDefault);
+		break;
+
+	case ATTR_CONTEXT_CODE:
+		// (keep this code aligned with its brother in unpacker::write_attrs)
+		count = ad.predefCount(CODE_ATTR_StackMapTable);
+		// disable this feature in old archives!
+		if (count != 0 && majver < JAVA6_PACKAGE_MAJOR_VERSION)
+		{
+			unpack_abort("undefined StackMapTable attribute (old archive format)");
+			return;
+		}
+		code_StackMapTable_N.readData(count);
+		count = code_StackMapTable_N.getIntTotal();
+		code_StackMapTable_frame_T.readData(count);
+		// the rest of it depends in a complicated way on frame tags
+		{
+			int fat_frame_count = 0;
+			int offset_count = 0;
+			int type_count = 0;
+			for (int k = 0; k < count; k++)
+			{
+				int tag = code_StackMapTable_frame_T.getByte();
+				if (tag <= 127)
+				{
+					// (64-127)  [(2)]
+					if (tag >= 64)
+						type_count++;
+				}
+				else if (tag <= 251)
+				{
+					// (247)     [(1)(2)]
+					// (248-251) [(1)]
+					if (tag >= 247)
+						offset_count++;
+					if (tag == 247)
+						type_count++;
+				}
+				else if (tag <= 254)
+				{
+					// (252)     [(1)(2)]
+					// (253)     [(1)(2)(2)]
+					// (254)     [(1)(2)(2)(2)]
+					offset_count++;
+					type_count += (tag - 251);
+				}
+				else
+				{
+					// (255)     [(1)NH[(2)]NH[(2)]]
+					fat_frame_count++;
+				}
+			}
+
+			// done pre-scanning frame tags:
+			code_StackMapTable_frame_T.rewind();
+
+			// deal completely with fat frames:
+			offset_count += fat_frame_count;
+			code_StackMapTable_local_N.readData(fat_frame_count);
+			type_count += code_StackMapTable_local_N.getIntTotal();
+			code_StackMapTable_stack_N.readData(fat_frame_count);
+			type_count += code_StackMapTable_stack_N.getIntTotal();
+			// read the rest:
+			code_StackMapTable_offset.readData(offset_count);
+			code_StackMapTable_T.readData(type_count);
+			// (7) [RCH]
+			count = code_StackMapTable_T.getIntCount(7);
+			code_StackMapTable_RC.readData(count);
+			// (8) [PH]
+			count = code_StackMapTable_T.getIntCount(8);
+			code_StackMapTable_P.readData(count);
+		}
+
+		count = ad.predefCount(CODE_ATTR_LineNumberTable);
+		code_LineNumberTable_N.readData(count);
+		count = code_LineNumberTable_N.getIntTotal();
+		code_LineNumberTable_bci_P.readData(count);
+		code_LineNumberTable_line.readData(count);
+
+		count = ad.predefCount(CODE_ATTR_LocalVariableTable);
+		code_LocalVariableTable_N.readData(count);
+		count = code_LocalVariableTable_N.getIntTotal();
+		code_LocalVariableTable_bci_P.readData(count);
+		code_LocalVariableTable_span_O.readData(count);
+		code_LocalVariableTable_name_RU.readData(count);
+		code_LocalVariableTable_type_RS.readData(count);
+		code_LocalVariableTable_slot.readData(count);
+
+		count = ad.predefCount(CODE_ATTR_LocalVariableTypeTable);
+		code_LocalVariableTypeTable_N.readData(count);
+		count = code_LocalVariableTypeTable_N.getIntTotal();
+		code_LocalVariableTypeTable_bci_P.readData(count);
+		code_LocalVariableTypeTable_span_O.readData(count);
+		code_LocalVariableTypeTable_name_RU.readData(count);
+		code_LocalVariableTypeTable_type_RS.readData(count);
+		code_LocalVariableTypeTable_slot.readData(count);
+		break;
+	}
+
+	// Read compressor-defined bands.
+	for (idx = 0; idx < ad.layouts.length(); idx++)
+	{
+		if (ad.getLayout(idx) == nullptr)
+			continue; // none at this fixed index <32
+		if (idx < (int)ad.flag_limit && ad.isPredefined(idx))
+			continue; // already handled
+		if (ad.getCount(idx) == 0)
+			continue; // no attributes of this type (then why transmit layouts?)
+		ad.readBandData(idx);
+	}
+}
+
+void unpacker::attr_definitions::readBandData(int idx)
+{
+	int j;
+	uint32_t count = getCount(idx);
+	if (count == 0)
+		return;
+	layout_definition *lo = getLayout(idx);
+	bool hasCallables = lo->hasCallables();
+	band **bands = lo->bands();
+	if (!hasCallables)
+	{
+		// Read through the rest of the bands in a regular way.
+		readBandData(bands, count);
+	}
+	else
+	{
+		// Deal with the callables.
+		// First set up the forward entry count for each callable.
+		// This is stored on band::length of the callable.
+		bands[0]->expectMoreLength(count);
+		for (j = 0; bands[j] != nullptr; j++)
+		{
+			band &j_cble = *bands[j];
+			assert(j_cble.le_kind == EK_CBLE);
+			if (j_cble.le_back)
+			{
+				// Add in the predicted effects of backward calls, too.
+				int back_calls = xxx_attr_calls().getInt();
+				j_cble.expectMoreLength(back_calls);
+				// In a moment, more forward calls may increment j_cble.length.
+			}
+		}
+		// Now consult whichever callables have non-zero entry counts.
+		readBandData(bands, (uint32_t) - 1);
+	}
+}
+
+// Recursive helper to the previous function:
+void unpacker::attr_definitions::readBandData(band **body, uint32_t count)
+{
+	int j, k;
+	for (j = 0; body[j] != nullptr; j++)
+	{
+		band &b = *body[j];
+		if (b.defc != nullptr)
+		{
+			// It has data, so read it.
+			b.readData(count);
+		}
+		switch (b.le_kind)
+		{
+		case EK_REPL:
+		{
+			int reps = b.getIntTotal();
+			readBandData(b.le_body, reps);
+		}
+		break;
+		case EK_UN:
+		{
+			int remaining = count;
+			for (k = 0; b.le_body[k] != nullptr; k++)
+			{
+				band &k_case = *b.le_body[k];
+				int k_count = 0;
+				if (k_case.le_casetags == nullptr)
+				{
+					k_count = remaining; // last (empty) case
+				}
+				else
+				{
+					int *tags = k_case.le_casetags;
+					int ntags = *tags++; // 1st element is length (why not?)
+					while (ntags-- > 0)
+					{
+						int tag = *tags++;
+						k_count += b.getIntCount(tag);
+					}
+				}
+				readBandData(k_case.le_body, k_count);
+				remaining -= k_count;
+			}
+			assert(remaining == 0);
+		}
+		break;
+		case EK_CALL:
+			// Push the count forward, if it is not a backward call.
+			if (!b.le_back)
+			{
+				band &cble = *b.le_body[0];
+				assert(cble.le_kind == EK_CBLE);
+				cble.expectMoreLength(count);
+			}
+			break;
+		case EK_CBLE:
+			assert((int)count == -1); // incoming count is meaningless
+			k = b.length;
+			assert(k >= 0);
+			// This is intended and required for non production mode.
+			assert((b.length = -1)); // make it unable to accept more calls now.
+			readBandData(b.le_body, k);
+			break;
+		}
+	}
+}
+
+static inline band **findMatchingCase(int matchTag, band **cases)
+{
+	for (int k = 0; cases[k] != nullptr; k++)
+	{
+		band &k_case = *cases[k];
+		if (k_case.le_casetags != nullptr)
+		{
+			// If it has tags, it must match a tag.
+			int *tags = k_case.le_casetags;
+			int ntags = *tags++; // 1st element is length
+			for (; ntags > 0; ntags--)
+			{
+				int tag = *tags++;
+				if (tag == matchTag)
+					break;
+			}
+			if (ntags == 0)
+				continue; // does not match
+		}
+		return k_case.le_body;
+	}
+	return nullptr;
+}
+
+// write attribute band data:
+void unpacker::putlayout(band **body)
+{
+	int i;
+	int prevBII = -1;
+	int prevBCI = -1;
+	if (body == NULL)
+	{
+		unpack_abort("putlayout: unexpected NULL for body");
+		return;
+	}
+	for (i = 0; body[i] != nullptr; i++)
+	{
+		band &b = *body[i];
+		byte le_kind = b.le_kind;
+
+		// Handle scalar part, if any.
+		int x = 0;
+		entry *e = nullptr;
+		if (b.defc != nullptr)
+		{
+			// It has data, so unparse an element.
+			if (b.ixTag != CONSTANT_None)
+			{
+				assert(le_kind == EK_REF);
+				if (b.ixTag == CONSTANT_Literal)
+					e = b.getRefUsing(cp.getKQIndex());
+				else
+					e = b.getRefN();
+				switch (b.le_len)
+				{
+				case 0:
+					break;
+				case 1:
+					putu1ref(e);
+					break;
+				case 2:
+					putref(e);
+					break;
+				case 4:
+					putu2(0);
+					putref(e);
+					break;
+				default:
+					assert(false);
+				}
+			}
+			else
+			{
+				assert(le_kind == EK_INT || le_kind == EK_REPL || le_kind == EK_UN);
+				x = b.getInt();
+
+				assert(!b.le_bci || prevBCI == (int)to_bci(prevBII));
+				switch (b.le_bci)
+				{
+				case EK_BCI: // PH:  transmit R(bci), store bci
+					x = to_bci(prevBII = x);
+					prevBCI = x;
+					break;
+				case EK_BCID: // POH: transmit D(R(bci)), store bci
+					x = to_bci(prevBII += x);
+					prevBCI = x;
+					break;
+				case EK_BCO: // OH:  transmit D(R(bci)), store D(bci)
+					x = to_bci(prevBII += x) - prevBCI;
+					prevBCI += x;
+					break;
+				}
+				assert(!b.le_bci || prevBCI == (int)to_bci(prevBII));
+
+				switch (b.le_len)
+				{
+				case 0:
+					break;
+				case 1:
+					putu1(x);
+					break;
+				case 2:
+					putu2(x);
+					break;
+				case 4:
+					putu4(x);
+					break;
+				default:
+					assert(false);
+				}
+			}
+		}
+
+		// Handle subparts, if any.
+		switch (le_kind)
+		{
+		case EK_REPL:
+			// x is the repeat count
+			while (x-- > 0)
+			{
+				putlayout(b.le_body);
+			}
+			break;
+		case EK_UN:
+			// x is the tag
+			putlayout(findMatchingCase(x, b.le_body));
+			break;
+		case EK_CALL:
+		{
+			band &cble = *b.le_body[0];
+			assert(cble.le_kind == EK_CBLE);
+			// FIXME: hit this one
+			// assert(cble.le_len == b.le_len);
+			putlayout(cble.le_body);
+		}
+		break;
+
+		case EK_CBLE:
+		case EK_CASE:
+			assert(false); // should not reach here
+		}
+	}
+}
+
+void unpacker::read_files()
+{
+	file_name.readData(file_count);
+	if ((archive_options & AO_HAVE_FILE_SIZE_HI) != 0)
+		file_size_hi.readData(file_count);
+	file_size_lo.readData(file_count);
+	if ((archive_options & AO_HAVE_FILE_MODTIME) != 0)
+		file_modtime.readData(file_count);
+	int allFiles = file_count + class_count;
+	if ((archive_options & AO_HAVE_FILE_OPTIONS) != 0)
+	{
+		file_options.readData(file_count);
+		// FO_IS_CLASS_STUB might be set, causing overlap between classes and files
+		for (int i = 0; i < file_count; i++)
+		{
+			if ((file_options.getInt() & FO_IS_CLASS_STUB) != 0)
+			{
+				allFiles -= 1; // this one counts as both class and file
+			}
+		}
+		file_options.rewind();
+	}
+	assert((default_file_options & FO_IS_CLASS_STUB) == 0);
+	files_remaining = allFiles;
+}
+
+void unpacker::get_code_header(int &max_stack, int &max_na_locals, int &handler_count,
+							   int &cflags)
+{
+	int sc = code_headers.getByte();
+	if (sc == 0)
+	{
+		max_stack = max_na_locals = handler_count = cflags = -1;
+		return;
+	}
+	// Short code header is the usual case:
+	int nh;
+	int mod;
+	if (sc < 1 + 12 * 12)
+	{
+		sc -= 1;
+		nh = 0;
+		mod = 12;
+	}
+	else if (sc < 1 + 12 * 12 + 8 * 8)
+	{
+		sc -= 1 + 12 * 12;
+		nh = 1;
+		mod = 8;
+	}
+	else
+	{
+		assert(sc < 1 + 12 * 12 + 8 * 8 + 7 * 7);
+		sc -= 1 + 12 * 12 + 8 * 8;
+		nh = 2;
+		mod = 7;
+	}
+	max_stack = sc % mod;
+	max_na_locals = sc / mod; // caller must add static, siglen
+	handler_count = nh;
+	if ((archive_options & AO_HAVE_ALL_CODE_FLAGS) != 0)
+		cflags = -1;
+	else
+		cflags = 0; // this one has no attributes
+}
+
+// Cf. PackageReader.readCodeHeaders
+void unpacker::read_code_headers()
+{
+	code_headers.readData(code_count);
+	int totalHandlerCount = 0;
+	int totalFlagsCount = 0;
+	for (int i = 0; i < code_count; i++)
+	{
+		int max_stack, max_locals, handler_count, cflags;
+		get_code_header(max_stack, max_locals, handler_count, cflags);
+		if (max_stack < 0)
+			code_max_stack.expectMoreLength(1);
+		if (max_locals < 0)
+			code_max_na_locals.expectMoreLength(1);
+		if (handler_count < 0)
+			code_handler_count.expectMoreLength(1);
+		else
+			totalHandlerCount += handler_count;
+		if (cflags < 0)
+			totalFlagsCount += 1;
+	}
+	code_headers.rewind(); // replay later during writing
+
+	code_max_stack.readData();
+	code_max_na_locals.readData();
+	code_handler_count.readData();
+	totalHandlerCount += code_handler_count.getIntTotal();
+
+	// Read handler specifications.
+	// Cf. PackageReader.readCodeHandlers.
+	code_handler_start_P.readData(totalHandlerCount);
+	code_handler_end_PO.readData(totalHandlerCount);
+	code_handler_catch_PO.readData(totalHandlerCount);
+	code_handler_class_RCN.readData(totalHandlerCount);
+
+	read_attrs(ATTR_CONTEXT_CODE, totalFlagsCount);
+}
+
+static inline bool is_in_range(uint32_t n, uint32_t min, uint32_t max)
+{
+	return n - min <= max - min; // unsigned arithmetic!
+}
+static inline bool is_field_op(int bc)
+{
+	return is_in_range(bc, bc_getstatic, bc_putfield);
+}
+static inline bool is_invoke_init_op(int bc)
+{
+	return is_in_range(bc, _invokeinit_op, _invokeinit_limit - 1);
+}
+static inline bool is_self_linker_op(int bc)
+{
+	return is_in_range(bc, _self_linker_op, _self_linker_limit - 1);
+}
+static bool is_branch_op(int bc)
+{
+	return is_in_range(bc, bc_ifeq, bc_jsr) || is_in_range(bc, bc_ifnull, bc_jsr_w);
+}
+static bool is_local_slot_op(int bc)
+{
+	return is_in_range(bc, bc_iload, bc_aload) || is_in_range(bc, bc_istore, bc_astore) ||
+		   bc == bc_iinc || bc == bc_ret;
+}
+band *unpacker::ref_band_for_op(int bc)
+{
+	switch (bc)
+	{
+	case bc_ildc:
+	case bc_ildc_w:
+		return &bc_intref;
+	case bc_fldc:
+	case bc_fldc_w:
+		return &bc_floatref;
+	case bc_lldc2_w:
+		return &bc_longref;
+	case bc_dldc2_w:
+		return &bc_doubleref;
+	case bc_aldc:
+	case bc_aldc_w:
+		return &bc_stringref;
+	case bc_cldc:
+	case bc_cldc_w:
+		return &bc_classref;
+
+	case bc_getstatic:
+	case bc_putstatic:
+	case bc_getfield:
+	case bc_putfield:
+		return &bc_fieldref;
+
+	case bc_invokevirtual:
+	case bc_invokespecial:
+	case bc_invokestatic:
+		return &bc_methodref;
+	case bc_invokeinterface:
+		return &bc_imethodref;
+
+	case bc_new:
+	case bc_anewarray:
+	case bc_checkcast:
+	case bc_instanceof:
+	case bc_multianewarray:
+		return &bc_classref;
+	}
+	return nullptr;
+}
+
+band *unpacker::ref_band_for_self_op(int bc, bool &isAloadVar, int &origBCVar)
+{
+	if (!is_self_linker_op(bc))
+		return nullptr;
+	int idx = (bc - _self_linker_op);
+	bool isSuper = (idx >= _self_linker_super_flag);
+	if (isSuper)
+		idx -= _self_linker_super_flag;
+	bool isAload = (idx >= _self_linker_aload_flag);
+	if (isAload)
+		idx -= _self_linker_aload_flag;
+	int origBC = _first_linker_op + idx;
+	bool isField = is_field_op(origBC);
+	isAloadVar = isAload;
+	origBCVar = _first_linker_op + idx;
+	if (!isSuper)
+		return isField ? &bc_thisfield : &bc_thismethod;
+	else
+		return isField ? &bc_superfield : &bc_supermethod;
+}
+
+// Cf. PackageReader.readByteCodes
+inline // called exactly once => inline
+	void
+unpacker::read_bcs()
+{
+	// read from bc_codes and bc_case_count
+	fillbytes all_switch_ops;
+	all_switch_ops.init();
+
+	// Read directly from rp/rplimit.
+	// Do this later:  bc_codes.readData(...)
+	byte *rp0 = rp;
+
+	band *bc_which;
+	byte *opptr = rp;
+	byte *oplimit = rplimit;
+
+	bool isAload; // passed by ref and then ignored
+	int junkBC;   // passed by ref and then ignored
+	for (int k = 0; k < code_count; k++)
+	{
+		// Scan one method:
+		for (;;)
+		{
+			if (opptr + 2 > oplimit)
+			{
+				rp = opptr;
+				ensure_input(2);
+				oplimit = rplimit;
+				rp = rp0; // back up
+			}
+			if (opptr == oplimit)
+			{
+				unpack_abort();
+			}
+			int bc = *opptr++ & 0xFF;
+			bool isWide = false;
+			if (bc == bc_wide)
+			{
+				if (opptr == oplimit)
+				{
+					unpack_abort();
+				}
+				bc = *opptr++ & 0xFF;
+				isWide = true;
+			}
+			// Adjust expectations of various band sizes.
+			switch (bc)
+			{
+			case bc_tableswitch:
+			case bc_lookupswitch:
+				all_switch_ops.addByte(bc);
+				break;
+			case bc_iinc:
+				bc_local.expectMoreLength(1);
+				bc_which = isWide ? &bc_short : &bc_byte;
+				bc_which->expectMoreLength(1);
+				break;
+			case bc_sipush:
+				bc_short.expectMoreLength(1);
+				break;
+			case bc_bipush:
+				bc_byte.expectMoreLength(1);
+				break;
+			case bc_newarray:
+				bc_byte.expectMoreLength(1);
+				break;
+			case bc_multianewarray:
+				assert(ref_band_for_op(bc) == &bc_classref);
+				bc_classref.expectMoreLength(1);
+				bc_byte.expectMoreLength(1);
+				break;
+			case bc_ref_escape:
+				bc_escrefsize.expectMoreLength(1);
+				bc_escref.expectMoreLength(1);
+				break;
+			case bc_byte_escape:
+				bc_escsize.expectMoreLength(1);
+				// bc_escbyte will have to be counted too
+				break;
+			default:
+				if (is_invoke_init_op(bc))
+				{
+					bc_initref.expectMoreLength(1);
+					break;
+				}
+				bc_which = ref_band_for_self_op(bc, isAload, junkBC);
+				if (bc_which != nullptr)
+				{
+					bc_which->expectMoreLength(1);
+					break;
+				}
+				if (is_branch_op(bc))
+				{
+					bc_label.expectMoreLength(1);
+					break;
+				}
+				bc_which = ref_band_for_op(bc);
+				if (bc_which != nullptr)
+				{
+					bc_which->expectMoreLength(1);
+					assert(bc != bc_multianewarray); // handled elsewhere
+					break;
+				}
+				if (is_local_slot_op(bc))
+				{
+					bc_local.expectMoreLength(1);
+					break;
+				}
+				break;
+			case bc_end_marker:
+				// Increment k and test against code_count.
+				goto doneScanningMethod;
+			}
+		}
+	doneScanningMethod:
+	{
+	}
+	}
+
+	// Go through the formality, so we can use it in a regular fashion later:
+	assert(rp == rp0);
+	bc_codes.readData((int)(opptr - rp));
+
+	int i = 0;
+
+	// To size instruction bands correctly, we need info on switches:
+	bc_case_count.readData((int)all_switch_ops.size());
+	for (i = 0; i < (int)all_switch_ops.size(); i++)
+	{
+		int caseCount = bc_case_count.getInt();
+		int bc = all_switch_ops.getByte(i);
+		bc_label.expectMoreLength(1 + caseCount); // default label + cases
+		bc_case_value.expectMoreLength(bc == bc_tableswitch ? 1 : caseCount);
+	}
+	bc_case_count.rewind(); // uses again for output
+
+	all_switch_ops.free();
+
+	for (i = e_bc_case_value; i <= e_bc_escsize; i++)
+	{
+		all_bands[i].readData();
+	}
+
+	// The bc_escbyte band is counted by the immediately previous band.
+	bc_escbyte.readData(bc_escsize.getIntTotal());
+}
+
+void unpacker::read_bands()
+{
+	read_file_header();
+
+	if (cp.nentries == 0)
+	{
+		// read_file_header failed to read a CP, because it copied a JAR.
+		return;
+	}
+
+	// Do this after the file header has been read:
+	check_options();
+
+	read_cp();
+	read_attr_defs();
+	read_ics();
+	read_classes();
+	read_bcs();
+	read_files();
+}
+
+/// CP routines
+
+entry *&constant_pool::hashTabRef(byte tag, bytes &b)
+{
+	uint32_t hash = tag + (int)b.len;
+	for (int i = 0; i < (int)b.len; i++)
+	{
+		hash = hash * 31 + (0xFF & b.ptr[i]);
+	}
+	entry **ht = hashTab;
+	int hlen = hashTabLength;
+	assert((hlen & (hlen - 1)) == 0);   // must be power of 2
+	uint32_t hash1 = hash & (hlen - 1); // == hash % hlen
+	uint32_t hash2 = 0;				 // lazily computed (requires mod op.)
+	int probes = 0;
+	while (ht[hash1] != nullptr)
+	{
+		entry &e = *ht[hash1];
+		if (e.value.b.equals(b) && e.tag == tag)
+			break;
+		if (hash2 == 0)
+			// Note:  hash2 must be relatively prime to hlen, hence the "|1".
+			hash2 = (((hash % 499) & (hlen - 1)) | 1);
+		hash1 += hash2;
+		if (hash1 >= (uint32_t)hlen)
+			hash1 -= hlen;
+		assert(hash1 < (uint32_t)hlen);
+		assert(++probes < hlen);
+	}
+	return ht[hash1];
+}
+
+static void insert_extra(entry *e, ptrlist &extras)
+{
+	// This ordering helps implement the Pack200 requirement
+	// of a predictable CP order in the class files produced.
+	e->inord = NO_INORD; // mark as an "extra"
+	extras.add(e);
+	// Note:  We will sort the list (by string-name) later.
+}
+
+entry *constant_pool::ensureUtf8(bytes &b)
+{
+	entry *&ix = hashTabRef(CONSTANT_Utf8, b);
+	if (ix != nullptr)
+		return ix;
+	// Make one.
+	if (nentries == maxentries)
+	{
+		unpack_abort("cp utf8 overflow");
+		return &entries[tag_base[CONSTANT_Utf8]]; // return something
+	}
+	entry &e = entries[nentries++];
+	e.tag = CONSTANT_Utf8;
+	u->saveTo(e.value.b, b);
+	assert(&e >= first_extra_entry);
+	insert_extra(&e, tag_extras[CONSTANT_Utf8]);
+	return ix = &e;
+}
+
+entry *constant_pool::ensureClass(bytes &b)
+{
+	entry *&ix = hashTabRef(CONSTANT_Class, b);
+	if (ix != nullptr)
+		return ix;
+	// Make one.
+	if (nentries == maxentries)
+	{
+		unpack_abort("cp class overflow");
+		return &entries[tag_base[CONSTANT_Class]]; // return something
+	}
+	entry &e = entries[nentries++];
+	e.tag = CONSTANT_Class;
+	e.nrefs = 1;
+	e.refs = U_NEW(entry *, 1);
+	ix = &e; // hold my spot in the index
+	entry *utf = ensureUtf8(b);
+	e.refs[0] = utf;
+	e.value.b = utf->value.b;
+	assert(&e >= first_extra_entry);
+	insert_extra(&e, tag_extras[CONSTANT_Class]);
+	return &e;
+}
+
+void constant_pool::expandSignatures()
+{
+	int i;
+	int nsigs = 0;
+	int nreused = 0;
+	int first_sig = tag_base[CONSTANT_Signature];
+	int sig_limit = tag_count[CONSTANT_Signature] + first_sig;
+	fillbytes buf;
+	buf.init(1 << 10);
+	for (i = first_sig; i < sig_limit; i++)
+	{
+		entry &e = entries[i];
+		assert(e.tag == CONSTANT_Signature);
+		int refnum = 0;
+		bytes form = e.refs[refnum++]->asUtf8();
+		buf.empty();
+		for (int j = 0; j < (int)form.len; j++)
+		{
+			int c = form.ptr[j];
+			buf.addByte(c);
+			if (c == 'L')
+			{
+				entry *cls = e.refs[refnum++];
+				buf.append(cls->className()->asUtf8());
+			}
+		}
+		assert(refnum == e.nrefs);
+		bytes &sig = buf.b;
+
+		// try to find a pre-existing Utf8:
+		entry *&e2 = hashTabRef(CONSTANT_Utf8, sig);
+		if (e2 != nullptr)
+		{
+			assert(e2->isUtf8(sig));
+			e.value.b = e2->value.b;
+			e.refs[0] = e2;
+			e.nrefs = 1;
+			nreused++;
+		}
+		else
+		{
+			// there is no other replacement; reuse this CP entry as a Utf8
+			u->saveTo(e.value.b, sig);
+			e.tag = CONSTANT_Utf8;
+			e.nrefs = 0;
+			e2 = &e;
+		}
+		nsigs++;
+	}
+	buf.free();
+
+	// go expunge all references to remaining signatures:
+	for (i = 0; i < (int)nentries; i++)
+	{
+		entry &e = entries[i];
+		for (int j = 0; j < e.nrefs; j++)
+		{
+			entry *&e2 = e.refs[j];
+			if (e2 != nullptr && e2->tag == CONSTANT_Signature)
+				e2 = e2->refs[0];
+		}
+	}
+}
+
+void constant_pool::initMemberIndexes()
+{
+	// This function does NOT refer to any class schema.
+	// It is totally internal to the cpool.
+	int i, j;
+
+	// Get the pre-existing indexes:
+	int nclasses = tag_count[CONSTANT_Class];
+	// entry *classes = tag_base[CONSTANT_Class] + entries; // UNUSED
+	int nfields = tag_count[CONSTANT_Fieldref];
+	entry *fields = tag_base[CONSTANT_Fieldref] + entries;
+	int nmethods = tag_count[CONSTANT_Methodref];
+	entry *methods = tag_base[CONSTANT_Methodref] + entries;
+
+	int *field_counts = T_NEW(int, nclasses);
+	int *method_counts = T_NEW(int, nclasses);
+	cpindex *all_indexes = U_NEW(cpindex, nclasses * 2);
+	entry **field_ix = U_NEW(entry *, add_size(nfields, nclasses));
+	entry **method_ix = U_NEW(entry *, add_size(nmethods, nclasses));
+
+	for (j = 0; j < nfields; j++)
+	{
+		entry &f = fields[j];
+		i = f.memberClass()->inord;
+		assert(i < nclasses);
+		field_counts[i]++;
+	}
+	for (j = 0; j < nmethods; j++)
+	{
+		entry &m = methods[j];
+		i = m.memberClass()->inord;
+		assert(i < nclasses);
+		method_counts[i]++;
+	}
+
+	int fbase = 0, mbase = 0;
+	for (i = 0; i < nclasses; i++)
+	{
+		int fc = field_counts[i];
+		int mc = method_counts[i];
+		all_indexes[i * 2 + 0].init(fc, field_ix + fbase, CONSTANT_Fieldref + SUBINDEX_BIT);
+		all_indexes[i * 2 + 1].init(mc, method_ix + mbase, CONSTANT_Methodref + SUBINDEX_BIT);
+		// reuse field_counts and member_counts as fill pointers:
+		field_counts[i] = fbase;
+		method_counts[i] = mbase;
+		fbase += fc + 1;
+		mbase += mc + 1;
+		// (the +1 leaves a space between every subarray)
+	}
+	assert(fbase == nfields + nclasses);
+	assert(mbase == nmethods + nclasses);
+
+	for (j = 0; j < nfields; j++)
+	{
+		entry &f = fields[j];
+		i = f.memberClass()->inord;
+		field_ix[field_counts[i]++] = &f;
+	}
+	for (j = 0; j < nmethods; j++)
+	{
+		entry &m = methods[j];
+		i = m.memberClass()->inord;
+		method_ix[method_counts[i]++] = &m;
+	}
+
+	member_indexes = all_indexes;
+
+	// Free intermediate buffers.
+	u->free_temps();
+}
+
+void entry::requestOutputIndex(constant_pool &cp, int req)
+{
+	assert(outputIndex <= NOT_REQUESTED); // must not have assigned indexes yet
+	if (tag == CONSTANT_Signature)
+	{
+		ref(0)->requestOutputIndex(cp, req);
+		return;
+	}
+	assert(req == REQUESTED || req == REQUESTED_LDC);
+	if (outputIndex != NOT_REQUESTED)
+	{
+		if (req == REQUESTED_LDC)
+			outputIndex = req; // this kind has precedence
+		return;
+	}
+	outputIndex = req;
+	// assert(!cp.outputEntries.contains(this));
+	assert(tag != CONSTANT_Signature);
+	cp.outputEntries.add(this);
+	for (int j = 0; j < nrefs; j++)
+	{
+		ref(j)->requestOutputIndex(cp);
+	}
+}
+
+void constant_pool::resetOutputIndexes()
+{
+	int i;
+	int noes = outputEntries.length();
+	entry **oes = (entry **)outputEntries.base();
+	for (i = 0; i < noes; i++)
+	{
+		entry &e = *oes[i];
+		e.outputIndex = NOT_REQUESTED;
+	}
+	outputIndexLimit = 0;
+	outputEntries.empty();
+}
+
+static const byte TAG_ORDER[CONSTANT_Limit] = {0, 1, 0, 2, 3, 4, 5, 7, 6, 10, 11, 12, 9, 8};
+
+extern "C" int outputEntry_cmp(const void *e1p, const void *e2p)
+{
+	// Sort entries according to the Pack200 rules for deterministic
+	// constant pool ordering.
+	//
+	// The four sort keys as follows, in order of decreasing importance:
+	//   1. ldc first, then non-ldc guys
+	//   2. normal cp_All entries by input order (i.e., address order)
+	//   3. after that, extra entries by lexical order (as in tag_extras[*])
+	entry &e1 = *(entry *)*(void **)e1p;
+	entry &e2 = *(entry *)*(void **)e2p;
+	int oi1 = e1.outputIndex;
+	int oi2 = e2.outputIndex;
+	assert(oi1 == REQUESTED || oi1 == REQUESTED_LDC);
+	assert(oi2 == REQUESTED || oi2 == REQUESTED_LDC);
+	if (oi1 != oi2)
+	{
+		if (oi1 == REQUESTED_LDC)
+			return 0 - 1;
+		if (oi2 == REQUESTED_LDC)
+			return 1 - 0;
+		// Else fall through; neither is an ldc request.
+	}
+	if (e1.inord != NO_INORD || e2.inord != NO_INORD)
+	{
+		// One or both is normal.  Use input order.
+		if (&e1 > &e2)
+			return 1 - 0;
+		if (&e1 < &e2)
+			return 0 - 1;
+		return 0; // equal pointers
+	}
+	// Both are extras.  Sort by tag and then by value.
+	if (e1.tag != e2.tag)
+	{
+		return TAG_ORDER[e1.tag] - TAG_ORDER[e2.tag];
+	}
+	// If the tags are the same, use string comparison.
+	return compare_Utf8_chars(e1.value.b, e2.value.b);
+}
+
+void constant_pool::computeOutputIndexes()
+{
+	int i;
+
+	int noes = outputEntries.length();
+	entry **oes = (entry **)outputEntries.base();
+
+	// Sort the output constant pool into the order required by Pack200.
+	PTRLIST_QSORT(outputEntries, outputEntry_cmp);
+
+	// Allocate a new index for each entry that needs one.
+	// We do this in two passes, one for LDC entries and one for the rest.
+	int nextIndex = 1; // always skip index #0 in output cpool
+	for (i = 0; i < noes; i++)
+	{
+		entry &e = *oes[i];
+		assert(e.outputIndex == REQUESTED || e.outputIndex == REQUESTED_LDC);
+		e.outputIndex = nextIndex++;
+		if (e.isDoubleWord())
+			nextIndex++; // do not use the next index
+	}
+	outputIndexLimit = nextIndex;
+}
+
+// Unpacker Start
+// Deallocate all internal storage and reset to a clean state.
+// Do not disturb any input or output connections, including
+// infileptr, inbytes, read_input_fn, jarout, or errstrm.
+// Do not reset any unpack options.
+void unpacker::reset()
+{
+	bytes_read_before_reset += bytes_read;
+	bytes_written_before_reset += bytes_written;
+	files_written_before_reset += files_written;
+	classes_written_before_reset += classes_written;
+	segments_read_before_reset += 1;
+	if (verbose >= 2)
+	{
+		fprintf(stderr, "After segment %d, " LONG_LONG_FORMAT
+						" bytes read and " LONG_LONG_FORMAT " bytes written.\n",
+				segments_read_before_reset - 1, bytes_read_before_reset,
+				bytes_written_before_reset);
+		fprintf(stderr,
+				"After segment %d, %d files (of which %d are classes) written to output.\n",
+				segments_read_before_reset - 1, files_written_before_reset,
+				classes_written_before_reset);
+		if (archive_next_count != 0)
+		{
+			fprintf(stderr, "After segment %d, %d segment%s remaining (estimated).\n",
+					segments_read_before_reset - 1, archive_next_count,
+					archive_next_count == 1 ? "" : "s");
+		}
+	}
+
+	unpacker save_u = (*this); // save bytewise image
+	infileptr = nullptr;	   // make asserts happy
+	jarout = nullptr;		  // do not close the output jar
+	gzin = nullptr;			// do not close the input gzip stream
+	this->free();
+	this->init(read_input_fn);
+
+	// restore selected interface state:
+	infileptr = save_u.infileptr;
+	inbytes = save_u.inbytes;
+	jarout = save_u.jarout;
+	gzin = save_u.gzin;
+	verbose = save_u.verbose;
+	deflate_hint_or_zero = save_u.deflate_hint_or_zero;
+	modification_time_or_zero = save_u.modification_time_or_zero;
+	bytes_read_before_reset = save_u.bytes_read_before_reset;
+	bytes_written_before_reset = save_u.bytes_written_before_reset;
+	files_written_before_reset = save_u.files_written_before_reset;
+	classes_written_before_reset = save_u.classes_written_before_reset;
+	segments_read_before_reset = save_u.segments_read_before_reset;
+	// Note:  If we use strip_names, watch out:  They get nuked here.
+}
+
+void unpacker::init(read_input_fn_t input_fn)
+{
+	int i;
+	BYTES_OF(*this).clear();
+	this->u = this; // self-reference for U_NEW macro
+	read_input_fn = input_fn;
+	all_bands = band::makeBands(this);
+	// Make a default jar buffer; caller may safely overwrite it.
+	jarout = U_NEW(jar, 1);
+	jarout->init(this);
+	for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
+		attr_defs[i].u = u; // set up outer ptr
+}
+
+// Usage: unpack a byte buffer
+// packptr is a reference to byte buffer containing a
+// packed file and len is the length of the buffer.
+// If nullptr, the callback is used to fill an internal buffer.
+void unpacker::start(void *packptr, size_t len)
+{
+	if (packptr != nullptr && len != 0)
+	{
+		inbytes.set((byte *)packptr, len);
+	}
+	read_bands();
+}
+
+void unpacker::check_options()
+{
+	if (deflate_hint_or_zero != 0)
+	{
+		bool force_deflate_hint = (deflate_hint_or_zero > 0);
+		if (force_deflate_hint)
+			default_file_options |= FO_DEFLATE_HINT;
+		else
+			default_file_options &= ~FO_DEFLATE_HINT;
+		// Turn off per-file deflate hint by force.
+		suppress_file_options |= FO_DEFLATE_HINT;
+	}
+	if (modification_time_or_zero != 0)
+	{
+		default_file_modtime = modification_time_or_zero;
+		// Turn off per-file modtime by force.
+		archive_options &= ~AO_HAVE_FILE_MODTIME;
+	}
+}
+
+// classfile writing
+
+void unpacker::reset_cur_classfile()
+{
+	// set defaults
+	cur_class_minver = default_class_minver;
+	cur_class_majver = default_class_majver;
+
+	// reset constant pool state
+	cp.resetOutputIndexes();
+
+	// reset fixups
+	class_fixup_type.empty();
+	class_fixup_offset.empty();
+	class_fixup_ref.empty();
+	requested_ics.empty();
+}
+
+cpindex *constant_pool::getKQIndex()
+{
+	char ch = '?';
+	if (u->cur_descr != nullptr)
+	{
+		entry *type = u->cur_descr->descrType();
+		ch = type->value.b.ptr[0];
+	}
+	byte tag = CONSTANT_Integer;
+	switch (ch)
+	{
+	case 'L':
+		tag = CONSTANT_String;
+		break;
+	case 'I':
+		tag = CONSTANT_Integer;
+		break;
+	case 'J':
+		tag = CONSTANT_Long;
+		break;
+	case 'F':
+		tag = CONSTANT_Float;
+		break;
+	case 'D':
+		tag = CONSTANT_Double;
+		break;
+	case 'B':
+	case 'S':
+	case 'C':
+	case 'Z':
+		tag = CONSTANT_Integer;
+		break;
+	default:
+		unpack_abort("bad KQ reference");
+		break;
+	}
+	return getIndex(tag);
+}
+
+uint32_t unpacker::to_bci(uint32_t bii)
+{
+	uint32_t len = bcimap.length();
+	uint32_t *map = (uint32_t *)bcimap.base();
+	assert(len > 0); // must be initialized before using to_bci
+	if (bii < len)
+		return map[bii];
+	// Else it's a fractional or out-of-range BCI.
+	uint32_t key = bii - len;
+	for (int i = len;; i--)
+	{
+		if (map[i - 1] - (i - 1) <= key)
+			break;
+		else
+			--bii;
+	}
+	return bii;
+}
+
+void unpacker::put_stackmap_type()
+{
+	int tag = code_StackMapTable_T.getByte();
+	putu1(tag);
+	switch (tag)
+	{
+	case 7: // (7) [RCH]
+		putref(code_StackMapTable_RC.getRef());
+		break;
+	case 8: // (8) [PH]
+		putu2(to_bci(code_StackMapTable_P.getInt()));
+		break;
+	}
+}
+
+// Functions for writing code.
+
+void unpacker::put_label(int curIP, int size)
+{
+	code_fixup_type.addByte(size);
+	code_fixup_offset.add((int)put_empty(size));
+	code_fixup_source.add(curIP);
+}
+
+inline // called exactly once => inline
+	void
+unpacker::write_bc_ops()
+{
+	bcimap.empty();
+	code_fixup_type.empty();
+	code_fixup_offset.empty();
+	code_fixup_source.empty();
+
+	band *bc_which;
+
+	byte *opptr = bc_codes.curRP();
+	// No need for oplimit, since the codes are pre-counted.
+
+	size_t codeBase = wpoffset();
+
+	bool isAload; // copy-out result
+	int origBC;
+
+	entry *thisClass = cur_class;
+	entry *superClass = cur_super;
+	entry *newClass = nullptr; // class of last _new opcode
+
+	// overwrite any prior index on these bands; it changes w/ current class:
+	bc_thisfield.setIndex(cp.getFieldIndex(thisClass));
+	bc_thismethod.setIndex(cp.getMethodIndex(thisClass));
+	if (superClass != nullptr)
+	{
+		bc_superfield.setIndex(cp.getFieldIndex(superClass));
+		bc_supermethod.setIndex(cp.getMethodIndex(superClass));
+	}
+
+	for (int curIP = 0;; curIP++)
+	{
+		int curPC = (int)(wpoffset() - codeBase);
+		bcimap.add(curPC);
+		ensure_put_space(10); // covers most instrs w/o further bounds check
+		int bc = *opptr++ & 0xFF;
+
+		putu1_fast(bc);
+		// Note:  See '--wp' below for pseudo-bytecodes like bc_end_marker.
+
+		bool isWide = false;
+		if (bc == bc_wide)
+		{
+			bc = *opptr++ & 0xFF;
+			putu1_fast(bc);
+			isWide = true;
+		}
+		switch (bc)
+		{
+		case bc_end_marker:
+			--wp; // not really part of the code
+			assert(opptr <= bc_codes.maxRP());
+			bc_codes.curRP() = opptr; // advance over this in bc_codes
+			goto doneScanningMethod;
+		case bc_tableswitch:  // apc:  (df, lo, hi, (hi-lo+1)*(label))
+		case bc_lookupswitch: // apc:  (df, nc, nc*(case, label))
+		{
+			int caseCount = bc_case_count.getInt();
+			while (((wpoffset() - codeBase) % 4) != 0)
+				putu1_fast(0);
+			ensure_put_space(30 + caseCount * 8);
+			put_label(curIP, 4); // int df = bc_label.getInt();
+			if (bc == bc_tableswitch)
+			{
+				int lo = bc_case_value.getInt();
+				int hi = lo + caseCount - 1;
+				putu4(lo);
+				putu4(hi);
+				for (int j = 0; j < caseCount; j++)
+				{
+					put_label(curIP, 4); // int lVal = bc_label.getInt();
+										 // int cVal = lo + j;
+				}
+			}
+			else
+			{
+				putu4(caseCount);
+				for (int j = 0; j < caseCount; j++)
+				{
+					int cVal = bc_case_value.getInt();
+					putu4(cVal);
+					put_label(curIP, 4); // int lVal = bc_label.getInt();
+				}
+			}
+			assert((int)to_bci(curIP) == curPC);
+			continue;
+		}
+		case bc_iinc:
+		{
+			int local = bc_local.getInt();
+			int delta = (isWide ? bc_short : bc_byte).getInt();
+			if (isWide)
+			{
+				putu2(local);
+				putu2(delta);
+			}
+			else
+			{
+				putu1_fast(local);
+				putu1_fast(delta);
+			}
+			continue;
+		}
+		case bc_sipush:
+		{
+			int val = bc_short.getInt();
+			putu2(val);
+			continue;
+		}
+		case bc_bipush:
+		case bc_newarray:
+		{
+			int val = bc_byte.getByte();
+			putu1_fast(val);
+			continue;
+		}
+		case bc_ref_escape:
+		{
+			// Note that insnMap has one entry for this.
+			--wp; // not really part of the code
+			int size = bc_escrefsize.getInt();
+			entry *ref = bc_escref.getRefN();
+			switch (size)
+			{
+			case 1:
+				putu1ref(ref);
+				break;
+			case 2:
+				putref(ref);
+				break;
+			default:
+				assert(false);
+			}
+			continue;
+		}
+		case bc_byte_escape:
+		{
+			// Note that insnMap has one entry for all these bytes.
+			--wp; // not really part of the code
+			int size = bc_escsize.getInt();
+			ensure_put_space(size);
+			for (int j = 0; j < size; j++)
+				putu1_fast(bc_escbyte.getByte());
+			continue;
+		}
+		default:
+			if (is_invoke_init_op(bc))
+			{
+				origBC = bc_invokespecial;
+				entry *classRef;
+				switch (bc - _invokeinit_op)
+				{
+				case _invokeinit_self_option:
+					classRef = thisClass;
+					break;
+				case _invokeinit_super_option:
+					classRef = superClass;
+					break;
+				default:
+					assert(bc == _invokeinit_op + _invokeinit_new_option);
+				case _invokeinit_new_option:
+					classRef = newClass;
+					break;
+				}
+				wp[-1] = origBC; // overwrite with origBC
+				int coding = bc_initref.getInt();
+				// Find the nth overloading of <init> in classRef.
+				entry *ref = nullptr;
+				cpindex *ix = (classRef == nullptr) ? nullptr : cp.getMethodIndex(classRef);
+				for (int j = 0, which_init = 0;; j++)
+				{
+					ref = (ix == nullptr) ? nullptr : ix->get(j);
+					if (ref == nullptr)
+						break; // oops, bad input
+					assert(ref->tag == CONSTANT_Methodref);
+					if (ref->memberDescr()->descrName() == cp.sym[constant_pool::s_lt_init_gt])
+					{
+						if (which_init++ == coding)
+							break;
+					}
+				}
+				putref(ref);
+				continue;
+			}
+			bc_which = ref_band_for_self_op(bc, isAload, origBC);
+			if (bc_which != nullptr)
+			{
+				if (!isAload)
+				{
+					wp[-1] = origBC; // overwrite with origBC
+				}
+				else
+				{
+					wp[-1] = bc_aload_0; // overwrite with _aload_0
+					// Note: insnMap keeps the _aload_0 separate.
+					bcimap.add(++curPC);
+					++curIP;
+					putu1_fast(origBC);
+				}
+				entry *ref = bc_which->getRef();
+				putref(ref);
+				continue;
+			}
+			if (is_branch_op(bc))
+			{
+				// int lVal = bc_label.getInt();
+				if (bc < bc_goto_w)
+				{
+					put_label(curIP, 2); // putu2(lVal & 0xFFFF);
+				}
+				else
+				{
+					assert(bc <= bc_jsr_w);
+					put_label(curIP, 4); // putu4(lVal);
+				}
+				assert((int)to_bci(curIP) == curPC);
+				continue;
+			}
+			bc_which = ref_band_for_op(bc);
+			if (bc_which != nullptr)
+			{
+				entry *ref = bc_which->getRefCommon(bc_which->ix, bc_which->nullOK);
+				if (ref == nullptr && bc_which == &bc_classref)
+				{
+					// Shorthand for class self-references.
+					ref = thisClass;
+				}
+				origBC = bc;
+				switch (bc)
+				{
+				case bc_ildc:
+				case bc_cldc:
+				case bc_fldc:
+				case bc_aldc:
+					origBC = bc_ldc;
+					break;
+				case bc_ildc_w:
+				case bc_cldc_w:
+				case bc_fldc_w:
+				case bc_aldc_w:
+					origBC = bc_ldc_w;
+					break;
+				case bc_lldc2_w:
+				case bc_dldc2_w:
+					origBC = bc_ldc2_w;
+					break;
+				case bc_new:
+					newClass = ref;
+					break;
+				}
+				wp[-1] = origBC; // overwrite with origBC
+				if (origBC == bc_ldc)
+				{
+					putu1ref(ref);
+				}
+				else
+				{
+					putref(ref);
+				}
+				if (origBC == bc_multianewarray)
+				{
+					// Copy the trailing byte also.
+					int val = bc_byte.getByte();
+					putu1_fast(val);
+				}
+				else if (origBC == bc_invokeinterface)
+				{
+					int argSize = ref->memberDescr()->descrType()->typeSize();
+					putu1_fast(1 + argSize);
+					putu1_fast(0);
+				}
+				continue;
+			}
+			if (is_local_slot_op(bc))
+			{
+				int local = bc_local.getInt();
+				if (isWide)
+				{
+					putu2(local);
+					if (bc == bc_iinc)
+					{
+						int iVal = bc_short.getInt();
+						putu2(iVal);
+					}
+				}
+				else
+				{
+					putu1_fast(local);
+					if (bc == bc_iinc)
+					{
+						int iVal = bc_byte.getByte();
+						putu1_fast(iVal);
+					}
+				}
+				continue;
+			}
+			// Random bytecode.  Just copy it.
+			assert(bc < bc_bytecode_limit);
+		}
+	}
+doneScanningMethod:
+{
+}
+	// bcimap.add(curPC);  // PC limit is already also in map, from bc_end_marker
+
+	// Armed with a bcimap, we can now fix up all the labels.
+	for (int i = 0; i < (int)code_fixup_type.size(); i++)
+	{
+		int type = code_fixup_type.getByte(i);
+		byte *bp = wp_at(code_fixup_offset.get(i));
+		int curIP = code_fixup_source.get(i);
+		int destIP = curIP + bc_label.getInt();
+		int span = to_bci(destIP) - to_bci(curIP);
+		switch (type)
+		{
+		case 2:
+			putu2_at(bp, (ushort)span);
+			break;
+		case 4:
+			putu4_at(bp, span);
+			break;
+		default:
+			assert(false);
+		}
+	}
+}
+
+inline // called exactly once => inline
+	void
+unpacker::write_code()
+{
+	int j;
+
+	int max_stack, max_locals, handler_count, cflags;
+	get_code_header(max_stack, max_locals, handler_count, cflags);
+
+	if (max_stack < 0)
+		max_stack = code_max_stack.getInt();
+	if (max_locals < 0)
+		max_locals = code_max_na_locals.getInt();
+	if (handler_count < 0)
+		handler_count = code_handler_count.getInt();
+
+	int siglen = cur_descr->descrType()->typeSize();
+	if ((cur_descr_flags & ACC_STATIC) == 0)
+		siglen++;
+	max_locals += siglen;
+
+	putu2(max_stack);
+	putu2(max_locals);
+	size_t bcbase = put_empty(4);
+
+	// Write the bytecodes themselves.
+	write_bc_ops();
+
+	byte *bcbasewp = wp_at(bcbase);
+	putu4_at(bcbasewp, (int)(wp - (bcbasewp + 4))); // size of code attr
+
+	putu2(handler_count);
+	for (j = 0; j < handler_count; j++)
+	{
+		int bii = code_handler_start_P.getInt();
+		putu2(to_bci(bii));
+		bii += code_handler_end_PO.getInt();
+		putu2(to_bci(bii));
+		bii += code_handler_catch_PO.getInt();
+		putu2(to_bci(bii));
+		putref(code_handler_class_RCN.getRefN());
+	}
+
+	uint64_t indexBits = cflags;
+	if (cflags < 0)
+	{
+		bool haveLongFlags = attr_defs[ATTR_CONTEXT_CODE].haveLongFlags();
+		indexBits = code_flags_hi.getLong(code_flags_lo, haveLongFlags);
+	}
+	write_attrs(ATTR_CONTEXT_CODE, indexBits);
+}
+
+int unpacker::write_attrs(int attrc, uint64_t indexBits)
+{
+	if (indexBits == 0)
+	{
+		// Quick short-circuit.
+		putu2(0);
+		return 0;
+	}
+
+	attr_definitions &ad = attr_defs[attrc];
+
+	int i, j, j2, idx, count;
+
+	int oiCount = 0;
+	if (ad.isPredefined(X_ATTR_OVERFLOW) && (indexBits & ((uint64_t)1 << X_ATTR_OVERFLOW)) != 0)
+	{
+		indexBits -= ((uint64_t)1 << X_ATTR_OVERFLOW);
+		oiCount = ad.xxx_attr_count().getInt();
+	}
+
+	int bitIndexes[X_ATTR_LIMIT_FLAGS_HI];
+	int biCount = 0;
+
+	// Fill bitIndexes with index bits, in order.
+	for (idx = 0; indexBits != 0; idx++, indexBits >>= 1)
+	{
+		if ((indexBits & 1) != 0)
+			bitIndexes[biCount++] = idx;
+	}
+	assert(biCount <= (int)lengthof(bitIndexes));
+
+	// Write a provisional attribute count, perhaps to be corrected later.
+	int naOffset = (int)wpoffset();
+	int na0 = biCount + oiCount;
+	putu2(na0);
+
+	int na = 0;
+	for (i = 0; i < na0; i++)
+	{
+		if (i < biCount)
+			idx = bitIndexes[i];
+		else
+			idx = ad.xxx_attr_indexes().getInt();
+		assert(ad.isIndex(idx));
+		entry *aname = nullptr;
+		entry *ref; // scratch
+		size_t abase = put_empty(2 + 4);
+		if (idx < (int)ad.flag_limit && ad.isPredefined(idx))
+		{
+			// Switch on the attrc and idx simultaneously.
+			switch (ADH_BYTE(attrc, idx))
+			{
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, X_ATTR_OVERFLOW) :
+			case ADH_BYTE(ATTR_CONTEXT_FIELD, X_ATTR_OVERFLOW) :
+			case ADH_BYTE(ATTR_CONTEXT_METHOD, X_ATTR_OVERFLOW) :
+			case ADH_BYTE(ATTR_CONTEXT_CODE, X_ATTR_OVERFLOW) :
+				// no attribute at all, so back up on this one
+				wp = wp_at(abase);
+				continue;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, CLASS_ATTR_ClassFile_version) :
+				cur_class_minver = class_ClassFile_version_minor_H.getInt();
+				cur_class_majver = class_ClassFile_version_major_H.getInt();
+				// back up; not a real attribute
+				wp = wp_at(abase);
+				continue;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, CLASS_ATTR_InnerClasses) :
+				// note the existence of this attr, but save for later
+				if (cur_class_has_local_ics)
+					unpack_abort("too many InnerClasses attrs");
+				cur_class_has_local_ics = true;
+				wp = wp_at(abase);
+				continue;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, CLASS_ATTR_SourceFile) :
+				aname = cp.sym[constant_pool::s_SourceFile];
+				ref = class_SourceFile_RUN.getRefN();
+				if (ref == nullptr)
+				{
+					bytes &n = cur_class->ref(0)->value.b;
+					// parse n = (<pkg>/)*<outer>?($<id>)*
+					int pkglen = lastIndexOf(SLASH_MIN, SLASH_MAX, n, (int)n.len) + 1;
+					bytes prefix = n.slice(pkglen, n.len);
+					for (;;)
+					{
+						// Work backwards, finding all '$', '#', etc.
+						int dollar =
+							lastIndexOf(DOLLAR_MIN, DOLLAR_MAX, prefix, (int)prefix.len);
+						if (dollar < 0)
+							break;
+						prefix = prefix.slice(0, dollar);
+					}
+					const char *suffix = ".java";
+					int len = (int)(prefix.len + strlen(suffix));
+					bytes name;
+					name.set(T_NEW(byte, add_size(len, 1)), len);
+					name.strcat(prefix).strcat(suffix);
+					ref = cp.ensureUtf8(name);
+				}
+				putref(ref);
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, CLASS_ATTR_EnclosingMethod) :
+				aname = cp.sym[constant_pool::s_EnclosingMethod];
+				putref(class_EnclosingMethod_RC.getRefN());
+				putref(class_EnclosingMethod_RDN.getRefN());
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_FIELD, FIELD_ATTR_ConstantValue) :
+				aname = cp.sym[constant_pool::s_ConstantValue];
+				putref(field_ConstantValue_KQ.getRefUsing(cp.getKQIndex()));
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_METHOD, METHOD_ATTR_Code) :
+				aname = cp.sym[constant_pool::s_Code];
+				write_code();
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_METHOD, METHOD_ATTR_Exceptions) :
+				aname = cp.sym[constant_pool::s_Exceptions];
+				putu2(count = method_Exceptions_N.getInt());
+				for (j = 0; j < count; j++)
+				{
+					putref(method_Exceptions_RC.getRefN());
+				}
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CODE, CODE_ATTR_StackMapTable) :
+				aname = cp.sym[constant_pool::s_StackMapTable];
+				// (keep this code aligned with its brother in unpacker::read_attrs)
+				putu2(count = code_StackMapTable_N.getInt());
+				for (j = 0; j < count; j++)
+				{
+					int tag = code_StackMapTable_frame_T.getByte();
+					putu1(tag);
+					if (tag <= 127)
+					{
+						// (64-127)  [(2)]
+						if (tag >= 64)
+							put_stackmap_type();
+					}
+					else if (tag <= 251)
+					{
+						// (247)     [(1)(2)]
+						// (248-251) [(1)]
+						if (tag >= 247)
+							putu2(code_StackMapTable_offset.getInt());
+						if (tag == 247)
+							put_stackmap_type();
+					}
+					else if (tag <= 254)
+					{
+						// (252)     [(1)(2)]
+						// (253)     [(1)(2)(2)]
+						// (254)     [(1)(2)(2)(2)]
+						putu2(code_StackMapTable_offset.getInt());
+						for (int k = (tag - 251); k > 0; k--)
+						{
+							put_stackmap_type();
+						}
+					}
+					else
+					{
+						// (255)     [(1)NH[(2)]NH[(2)]]
+						putu2(code_StackMapTable_offset.getInt());
+						putu2(j2 = code_StackMapTable_local_N.getInt());
+						while (j2-- > 0)
+							put_stackmap_type();
+						putu2(j2 = code_StackMapTable_stack_N.getInt());
+						while (j2-- > 0)
+							put_stackmap_type();
+					}
+				}
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CODE, CODE_ATTR_LineNumberTable) :
+				aname = cp.sym[constant_pool::s_LineNumberTable];
+				putu2(count = code_LineNumberTable_N.getInt());
+				for (j = 0; j < count; j++)
+				{
+					putu2(to_bci(code_LineNumberTable_bci_P.getInt()));
+					putu2(code_LineNumberTable_line.getInt());
+				}
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CODE, CODE_ATTR_LocalVariableTable) :
+				aname = cp.sym[constant_pool::s_LocalVariableTable];
+				putu2(count = code_LocalVariableTable_N.getInt());
+				for (j = 0; j < count; j++)
+				{
+					int bii = code_LocalVariableTable_bci_P.getInt();
+					int bci = to_bci(bii);
+					putu2(bci);
+					bii += code_LocalVariableTable_span_O.getInt();
+					putu2(to_bci(bii) - bci);
+					putref(code_LocalVariableTable_name_RU.getRefN());
+					putref(code_LocalVariableTable_type_RS.getRefN());
+					putu2(code_LocalVariableTable_slot.getInt());
+				}
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CODE, CODE_ATTR_LocalVariableTypeTable) :
+				aname = cp.sym[constant_pool::s_LocalVariableTypeTable];
+				putu2(count = code_LocalVariableTypeTable_N.getInt());
+				for (j = 0; j < count; j++)
+				{
+					int bii = code_LocalVariableTypeTable_bci_P.getInt();
+					int bci = to_bci(bii);
+					putu2(bci);
+					bii += code_LocalVariableTypeTable_span_O.getInt();
+					putu2(to_bci(bii) - bci);
+					putref(code_LocalVariableTypeTable_name_RU.getRefN());
+					putref(code_LocalVariableTypeTable_type_RS.getRefN());
+					putu2(code_LocalVariableTypeTable_slot.getInt());
+				}
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, X_ATTR_Signature) :
+				aname = cp.sym[constant_pool::s_Signature];
+				putref(class_Signature_RS.getRefN());
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_FIELD, X_ATTR_Signature) :
+				aname = cp.sym[constant_pool::s_Signature];
+				putref(field_Signature_RS.getRefN());
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_METHOD, X_ATTR_Signature) :
+				aname = cp.sym[constant_pool::s_Signature];
+				putref(method_Signature_RS.getRefN());
+				break;
+
+			case ADH_BYTE(ATTR_CONTEXT_CLASS, X_ATTR_Deprecated) :
+			case ADH_BYTE(ATTR_CONTEXT_FIELD, X_ATTR_Deprecated) :
+			case ADH_BYTE(ATTR_CONTEXT_METHOD, X_ATTR_Deprecated) :
+				aname = cp.sym[constant_pool::s_Deprecated];
+				// no data
+				break;
+			}
+		}
+
+		if (aname == nullptr)
+		{
+			// Unparse a compressor-defined attribute.
+			layout_definition *lo = ad.getLayout(idx);
+			if (lo == nullptr)
+			{
+				unpack_abort("bad layout index");
+				break;
+			}
+			assert((int)lo->idx == idx);
+			aname = lo->nameEntry;
+			if (aname == nullptr)
+			{
+				bytes nameb;
+				nameb.set(lo->name);
+				aname = cp.ensureUtf8(nameb);
+				// Cache the name entry for next time.
+				lo->nameEntry = aname;
+			}
+			// Execute all the layout elements.
+			band **bands = lo->bands();
+			if (lo->hasCallables())
+			{
+				band &cble = *bands[0];
+				assert(cble.le_kind == EK_CBLE);
+				bands = cble.le_body;
+			}
+			putlayout(bands);
+		}
+
+		if (aname == nullptr)
+			unpack_abort("bad attribute index");
+
+		byte *wp1 = wp;
+		wp = wp_at(abase);
+
+		// DTRT if this attr is on the strip-list.
+		// (Note that we emptied the data out of the band first.)
+		if (ad.strip_names.contains(aname))
+		{
+			continue;
+		}
+
+		// patch the name and length
+		putref(aname);
+		putu4((int)(wp1 - (wp + 4))); // put the attr size
+		wp = wp1;
+		na++; // count the attrs actually written
+	}
+
+	if (na != na0)
+		// Refresh changed count.
+		putu2_at(wp_at(naOffset), na);
+	return na;
+}
+
+void unpacker::write_members(int num, int attrc)
+{
+	attr_definitions &ad = attr_defs[attrc];
+	band &member_flags_hi = ad.xxx_flags_hi();
+	band &member_flags_lo = ad.xxx_flags_lo();
+	band &member_descr = (&member_flags_hi)[e_field_descr - e_field_flags_hi];
+	bool haveLongFlags = ad.haveLongFlags();
+
+	putu2(num);
+	uint64_t indexMask = attr_defs[attrc].flagIndexMask();
+	for (int i = 0; i < num; i++)
+	{
+		uint64_t mflags = member_flags_hi.getLong(member_flags_lo, haveLongFlags);
+		entry *mdescr = member_descr.getRef();
+		cur_descr = mdescr;
+		putu2(cur_descr_flags = (ushort)(mflags & ~indexMask));
+		putref(mdescr->descrName());
+		putref(mdescr->descrType());
+		write_attrs(attrc, (mflags & indexMask));
+	}
+	cur_descr = nullptr;
+}
+
+extern "C" int raw_address_cmp(const void *p1p, const void *p2p)
+{
+	void *p1 = *(void **)p1p;
+	void *p2 = *(void **)p2p;
+	return (p1 > p2) ? 1 : (p1 < p2) ? -1 : 0;
+}
+
+void unpacker::write_classfile_tail()
+{
+	cur_classfile_tail.empty();
+	set_output(&cur_classfile_tail);
+
+	int i, num;
+
+	attr_definitions &ad = attr_defs[ATTR_CONTEXT_CLASS];
+
+	bool haveLongFlags = ad.haveLongFlags();
+	uint64_t kflags = class_flags_hi.getLong(class_flags_lo, haveLongFlags);
+	uint64_t indexMask = ad.flagIndexMask();
+
+	cur_class = class_this.getRef();
+	cur_super = class_super.getRef();
+
+	if (cur_super == cur_class)
+		cur_super = nullptr;
+	// special representation for java/lang/Object
+
+	putu2((ushort)(kflags & ~indexMask));
+	putref(cur_class);
+	putref(cur_super);
+
+	putu2(num = class_interface_count.getInt());
+	for (i = 0; i < num; i++)
+	{
+		putref(class_interface.getRef());
+	}
+
+	write_members(class_field_count.getInt(), ATTR_CONTEXT_FIELD);
+	write_members(class_method_count.getInt(), ATTR_CONTEXT_METHOD);
+
+	cur_class_has_local_ics = false; // may be set true by write_attrs
+
+	int naOffset = (int)wpoffset();
+	int na = write_attrs(ATTR_CONTEXT_CLASS, (kflags & indexMask));
+
+// at the very last, choose which inner classes (if any) pertain to k:
+#ifdef ASSERT
+	for (i = 0; i < ic_count; i++)
+	{
+		assert(!ics[i].requested);
+	}
+#endif
+	// First, consult the global table and the local constant pool,
+	// and decide on the globally implied inner classes.
+	// (Note that we read the cpool's outputIndex fields, but we
+	// do not yet write them, since the local IC attribute might
+	// reverse a global decision to declare an IC.)
+	assert(requested_ics.length() == 0); // must start out empty
+	// Always include all members of the current class.
+	for (inner_class *child = cp.getFirstChildIC(cur_class); child != nullptr;
+		 child = cp.getNextChildIC(child))
+	{
+		child->requested = true;
+		requested_ics.add(child);
+	}
+	// And, for each inner class mentioned in the constant pool,
+	// include it and all its outers.
+	int noes = cp.outputEntries.length();
+	entry **oes = (entry **)cp.outputEntries.base();
+	for (i = 0; i < noes; i++)
+	{
+		entry &e = *oes[i];
+		if (e.tag != CONSTANT_Class)
+			continue; // wrong sort
+		for (inner_class *ic = cp.getIC(&e); ic != nullptr; ic = cp.getIC(ic->outer))
+		{
+			if (ic->requested)
+				break; // already processed
+			ic->requested = true;
+			requested_ics.add(ic);
+		}
+	}
+	int local_ics = requested_ics.length();
+	// Second, consult a local attribute (if any) and adjust the global set.
+	inner_class *extra_ics = nullptr;
+	int num_extra_ics = 0;
+	if (cur_class_has_local_ics)
+	{
+		// adjust the set of ICs by symmetric set difference w/ the locals
+		num_extra_ics = class_InnerClasses_N.getInt();
+		if (num_extra_ics == 0)
+		{
+			// Explicit zero count has an irregular meaning:  It deletes the attr.
+			local_ics = 0; // (short-circuit all tests of requested bits)
+		}
+		else
+		{
+			extra_ics = T_NEW(inner_class, num_extra_ics);
+			// Note:  extra_ics will be freed up by next call to get_next_file().
+		}
+	}
+	for (i = 0; i < num_extra_ics; i++)
+	{
+		inner_class &extra_ic = extra_ics[i];
+		extra_ic.inner = class_InnerClasses_RC.getRef();
+		// Find the corresponding equivalent global IC:
+		inner_class *global_ic = cp.getIC(extra_ic.inner);
+		int flags = class_InnerClasses_F.getInt();
+		if (flags == 0)
+		{
+			// The extra IC is simply a copy of a global IC.
+			if (global_ic == nullptr)
+			{
+				unpack_abort("bad reference to inner class");
+				break;
+			}
+			extra_ic = (*global_ic); // fill in rest of fields
+		}
+		else
+		{
+			flags &= ~ACC_IC_LONG_FORM; // clear high bit if set to get clean zero
+			extra_ic.flags = flags;
+			extra_ic.outer = class_InnerClasses_outer_RCN.getRefN();
+			extra_ic.name = class_InnerClasses_name_RUN.getRefN();
+			// Detect if this is an exact copy of the global tuple.
+			if (global_ic != nullptr)
+			{
+				if (global_ic->flags != extra_ic.flags || global_ic->outer != extra_ic.outer ||
+					global_ic->name != extra_ic.name)
+				{
+					global_ic = nullptr; // not really the same, so break the link
+				}
+			}
+		}
+		if (global_ic != nullptr && global_ic->requested)
+		{
+			// This local repetition reverses the globally implied request.
+			global_ic->requested = false;
+			extra_ic.requested = false;
+			local_ics -= 1;
+		}
+		else
+		{
+			// The global either does not exist, or is not yet requested.
+			extra_ic.requested = true;
+			local_ics += 1;
+		}
+	}
+	// Finally, if there are any that survived, put them into an attribute.
+	// (Note that a zero-count attribute is always deleted.)
+	// The putref calls below will tell the constant pool to add any
+	// necessary local CP references to support the InnerClasses attribute.
+	// This step must be the last round of additions to the local CP.
+	if (local_ics > 0)
+	{
+		// append the new attribute:
+		putref(cp.sym[constant_pool::s_InnerClasses]);
+		putu4(2 + 2 * 4 * local_ics);
+		putu2(local_ics);
+		PTRLIST_QSORT(requested_ics, raw_address_cmp);
+		int num_global_ics = requested_ics.length();
+		for (i = -num_global_ics; i < num_extra_ics; i++)
+		{
+			inner_class *ic;
+			if (i < 0)
+				ic = (inner_class *)requested_ics.get(num_global_ics + i);
+			else
+				ic = &extra_ics[i];
+			if (ic->requested)
+			{
+				putref(ic->inner);
+				putref(ic->outer);
+				putref(ic->name);
+				putu2(ic->flags);
+			}
+		}
+		putu2_at(wp_at(naOffset), ++na); // increment class attr count
+	}
+
+	// Tidy up global 'requested' bits:
+	for (i = requested_ics.length(); --i >= 0;)
+	{
+		inner_class *ic = (inner_class *)requested_ics.get(i);
+		ic->requested = false;
+	}
+	requested_ics.empty();
+
+	close_output();
+
+	// rewrite CP references in the tail
+	cp.computeOutputIndexes();
+	int nextref = 0;
+	for (i = 0; i < (int)class_fixup_type.size(); i++)
+	{
+		int type = class_fixup_type.getByte(i);
+		byte *fixp = wp_at(class_fixup_offset.get(i));
+		entry *e = (entry *)class_fixup_ref.get(nextref++);
+		int idx = e->getOutputIndex();
+		switch (type)
+		{
+		case 1:
+			putu1_at(fixp, idx);
+			break;
+		case 2:
+			putu2_at(fixp, idx);
+			break;
+		default:
+			assert(false); // should not reach here
+		}
+	}
+}
+
+void unpacker::write_classfile_head()
+{
+	cur_classfile_head.empty();
+	set_output(&cur_classfile_head);
+
+	putu4(JAVA_MAGIC);
+	putu2(cur_class_minver);
+	putu2(cur_class_majver);
+	putu2(cp.outputIndexLimit);
+
+	int checkIndex = 1;
+	int noes = cp.outputEntries.length();
+	entry **oes = (entry **)cp.outputEntries.base();
+	for (int i = 0; i < noes; i++)
+	{
+		entry &e = *oes[i];
+		assert(e.getOutputIndex() == checkIndex++);
+		byte tag = e.tag;
+		assert(tag != CONSTANT_Signature);
+		putu1(tag);
+		switch (tag)
+		{
+		case CONSTANT_Utf8:
+			putu2((int)e.value.b.len);
+			put_bytes(e.value.b);
+			break;
+		case CONSTANT_Integer:
+		case CONSTANT_Float:
+			putu4(e.value.i);
+			break;
+		case CONSTANT_Long:
+		case CONSTANT_Double:
+			putu8(e.value.l);
+			assert(checkIndex++);
+			break;
+		case CONSTANT_Class:
+		case CONSTANT_String:
+			// just write the ref
+			putu2(e.refs[0]->getOutputIndex());
+			break;
+		case CONSTANT_Fieldref:
+		case CONSTANT_Methodref:
+		case CONSTANT_InterfaceMethodref:
+		case CONSTANT_NameandType:
+			putu2(e.refs[0]->getOutputIndex());
+			putu2(e.refs[1]->getOutputIndex());
+			break;
+		default:
+			unpack_abort(ERROR_INTERNAL);
+		}
+	}
+	close_output();
+}
+
+unpacker::file *unpacker::get_next_file()
+{
+	free_temps();
+	if (files_remaining == 0)
+	{
+		// Leave a clue that we're exhausted.
+		cur_file.name = nullptr;
+		cur_file.size = 0;
+		if (archive_size != 0)
+		{
+			uint64_t predicted_size = unsized_bytes_read + archive_size;
+			if (predicted_size != bytes_read)
+				unpack_abort("archive header had incorrect size");
+		}
+		return nullptr;
+	}
+	files_remaining -= 1;
+	assert(files_written < file_count || classes_written < class_count);
+	cur_file.name = "";
+	cur_file.size = 0;
+	cur_file.modtime = default_file_modtime;
+	cur_file.options = default_file_options;
+	cur_file.data[0].set(nullptr, 0);
+	cur_file.data[1].set(nullptr, 0);
+	if (files_written < file_count)
+	{
+		entry *e = file_name.getRef();
+		cur_file.name = e->utf8String();
+		bool haveLongSize = ((archive_options & AO_HAVE_FILE_SIZE_HI) != 0);
+		cur_file.size = file_size_hi.getLong(file_size_lo, haveLongSize);
+		if ((archive_options & AO_HAVE_FILE_MODTIME) != 0)
+			cur_file.modtime += file_modtime.getInt(); // relative to archive modtime
+		if ((archive_options & AO_HAVE_FILE_OPTIONS) != 0)
+			cur_file.options |= file_options.getInt() & ~suppress_file_options;
+	}
+	else if (classes_written < class_count)
+	{
+		// there is a class for a missing file record
+		cur_file.options |= FO_IS_CLASS_STUB;
+	}
+	if ((cur_file.options & FO_IS_CLASS_STUB) != 0)
+	{
+		assert(classes_written < class_count);
+		classes_written += 1;
+		if (cur_file.size != 0)
+		{
+			unpack_abort("class file size transmitted");
+		}
+		reset_cur_classfile();
+
+		// write the meat of the classfile:
+		write_classfile_tail();
+		cur_file.data[1] = cur_classfile_tail.b;
+
+		// write the CP of the classfile, second:
+		write_classfile_head();
+		cur_file.data[0] = cur_classfile_head.b;
+
+		cur_file.size += cur_file.data[0].len;
+		cur_file.size += cur_file.data[1].len;
+		if (cur_file.name[0] == '\0')
+		{
+			bytes &prefix = cur_class->ref(0)->value.b;
+			const char *suffix = ".class";
+			int len = (int)(prefix.len + strlen(suffix));
+			bytes name;
+			name.set(T_NEW(byte, add_size(len, 1)), len);
+			cur_file.name = name.strcat(prefix).strcat(suffix).strval();
+		}
+	}
+	else
+	{
+		// If there is buffered file data, produce a pointer to it.
+		if (cur_file.size != (size_t)cur_file.size)
+		{
+			// Silly size specified.
+			unpack_abort("resource file too large");
+		}
+		size_t rpleft = input_remaining();
+		if (rpleft > 0)
+		{
+			if (rpleft > cur_file.size)
+				rpleft = (size_t)cur_file.size;
+			cur_file.data[0].set(rp, rpleft);
+			rp += rpleft;
+		}
+		if (rpleft < cur_file.size)
+		{
+			// Caller must read the rest.
+			size_t fleft = (size_t)cur_file.size - rpleft;
+			bytes_read += fleft; // Credit it to the overall archive size.
+		}
+	}
+	bytes_written += cur_file.size;
+	files_written += 1;
+	return &cur_file;
+}
+
+// Write a file to jarout.
+void unpacker::write_file_to_jar(unpacker::file *f)
+{
+	size_t htsize = f->data[0].len + f->data[1].len;
+	uint64_t fsize = f->size;
+	if (htsize == fsize)
+	{
+		jarout->addJarEntry(f->name, f->deflate_hint(), f->modtime, f->data[0], f->data[1]);
+	}
+	else
+	{
+		assert(input_remaining() == 0);
+		bytes part1, part2;
+		part1.len = f->data[0].len;
+		part1.set(T_NEW(byte, part1.len), part1.len);
+		part1.copyFrom(f->data[0]);
+		assert(f->data[1].len == 0);
+		part2.set(nullptr, 0);
+		size_t fleft = (size_t)fsize - part1.len;
+		assert(bytes_read > fleft); // part2 already credited by get_next_file
+		bytes_read -= fleft;
+		if (fleft > 0)
+		{
+			// Must read some more.
+			if (live_input)
+			{
+				// Stop using the input buffer.  Make a new one:
+				if (free_input)
+					input.free();
+				input.init(fleft > (1 << 12) ? fleft : (1 << 12));
+				free_input = true;
+				live_input = false;
+			}
+			else
+			{
+				// Make it large enough.
+				assert(free_input); // must be reallocable
+				input.ensureSize(fleft);
+			}
+			rplimit = rp = input.base();
+			input.setLimit(rp + fleft);
+			if (!ensure_input(fleft))
+				unpack_abort("EOF reading resource file");
+			part2.ptr = input_scan();
+			part2.len = input_remaining();
+			rplimit = rp = input.base();
+		}
+		jarout->addJarEntry(f->name, f->deflate_hint(), f->modtime, part1, part2);
+	}
+	if (verbose >= 3)
+	{
+		fprintf(stderr, "Wrote " LONG_LONG_FORMAT " bytes to: %s\n", fsize, f->name);
+	}
+}
diff --git a/libraries/pack200/src/unpack.h b/libraries/pack200/src/unpack.h
new file mode 100644
index 00000000..0100700d
--- /dev/null
+++ b/libraries/pack200/src/unpack.h
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// Global Structures
+struct jar;
+struct gunzip;
+struct band;
+struct constant_pool;
+struct entry;
+struct cpindex;
+struct inner_class;
+struct value_stream;
+
+struct cpindex
+{
+	uint32_t len;
+	entry *base1;  // base of primary index
+	entry **base2; // base of secondary index
+	byte ixTag;	// type of entries (!= CONSTANT_None), plus 64 if sub-index
+	enum
+	{
+		SUB_TAG = 64
+	};
+
+	entry *get(uint32_t i);
+
+	void init(int len_, entry *base1_, int ixTag_)
+	{
+		len = len_;
+		base1 = base1_;
+		base2 = nullptr;
+		ixTag = ixTag_;
+	}
+	void init(int len_, entry **base2_, int ixTag_)
+	{
+		len = len_;
+		base1 = nullptr;
+		base2 = base2_;
+		ixTag = ixTag_;
+	}
+};
+
+struct constant_pool
+{
+	uint32_t nentries;
+	entry *entries;
+	entry *first_extra_entry;
+	uint32_t maxentries; // total allocated size of entries
+
+	// Position and size of each homogeneous subrange:
+	int tag_count[CONSTANT_Limit];
+	int tag_base[CONSTANT_Limit];
+	cpindex tag_index[CONSTANT_Limit];
+	ptrlist tag_extras[CONSTANT_Limit];
+
+	cpindex *member_indexes; // indexed by 2*CONSTANT_Class.inord
+	cpindex *getFieldIndex(entry *classRef);
+	cpindex *getMethodIndex(entry *classRef);
+
+	inner_class **ic_index;
+	inner_class **ic_child_index;
+	inner_class *getIC(entry *inner);
+	inner_class *getFirstChildIC(entry *outer);
+	inner_class *getNextChildIC(inner_class *child);
+
+	int outputIndexLimit;  // index limit after renumbering
+	ptrlist outputEntries; // list of entry* needing output idx assigned
+
+	entry **hashTab;
+	uint32_t hashTabLength;
+	entry *&hashTabRef(byte tag, bytes &b);
+	entry *ensureUtf8(bytes &b);
+	entry *ensureClass(bytes &b);
+
+	// Well-known Utf8 symbols.
+	enum
+	{
+#define SNAME(n, s) s_##s,
+		ALL_ATTR_DO(SNAME)
+#undef SNAME
+		s_lt_init_gt, // <init>
+		s_LIMIT
+	};
+	entry *sym[s_LIMIT];
+
+	// read counts from hdr, allocate main arrays
+	enum
+	{
+		NUM_COUNTS = 12
+	};
+	void init(unpacker *u, int counts[NUM_COUNTS]);
+
+	// pointer to outer unpacker, for error checks etc.
+	unpacker *u;
+
+	int getCount(byte tag)
+	{
+		assert((uint32_t)tag < CONSTANT_Limit);
+		return tag_count[tag];
+	}
+	cpindex *getIndex(byte tag)
+	{
+		assert((uint32_t)tag < CONSTANT_Limit);
+		return &tag_index[tag];
+	}
+	cpindex *getKQIndex(); // uses cur_descr
+
+	void expandSignatures();
+	void initMemberIndexes();
+
+	void computeOutputOrder();
+	void computeOutputIndexes();
+	void resetOutputIndexes();
+};
+
+/*
+ * The unpacker provides the entry points to the unpack engine,
+ * as well as maintains the state of the engine.
+ */
+struct unpacker
+{
+	// One element of the resulting JAR.
+	struct file
+	{
+		const char *name;
+		uint64_t size;
+		int modtime;
+		int options;
+		bytes data[2];
+		// Note:  If Sum(data[*].len) < size,
+		// remaining bytes must be read directly from the input stream.
+		bool deflate_hint()
+		{
+			return ((options & FO_DEFLATE_HINT) != 0);
+		}
+	};
+
+	// if running Unix-style, here are the inputs and outputs
+	FILE *infileptr; // buffered
+	bytes inbytes;   // direct
+	gunzip *gzin;	// gunzip filter, if any
+	jar *jarout;	 // output JAR file
+
+	// pointer to self, for U_NEW macro
+	unpacker *u;
+
+	ptrlist mallocs;	 // list of guys to free when we are all done
+	ptrlist tmallocs;	// list of guys to free on next client request
+	fillbytes smallbuf;  // supplies small alloc requests
+	fillbytes tsmallbuf; // supplies temporary small alloc requests
+
+	// option management members
+	int verbose;			  // verbose level, 0 means no output
+	int deflate_hint_or_zero; // ==0 means not set, otherwise -1 or 1
+	int modification_time_or_zero;
+
+	// input stream
+	fillbytes input; // the whole block (size is predicted, has slop too)
+	bool live_input; // is the data in this block live?
+	bool free_input; // must the input buffer be freed?
+	byte *rp;		// read pointer (< rplimit <= input.limit())
+	byte *rplimit;   // how much of the input block has been read?
+	uint64_t bytes_read;
+	int unsized_bytes_read;
+
+	// callback to read at least one byte, up to available input
+	typedef int64_t (*read_input_fn_t)(unpacker *self, void *buf, int64_t minlen,
+									   int64_t maxlen);
+	read_input_fn_t read_input_fn;
+
+	// archive header fields
+	int magic, minver, majver;
+	size_t archive_size;
+	int archive_next_count, archive_options, archive_modtime;
+	int band_headers_size;
+	int file_count, attr_definition_count, ic_count, class_count;
+	int default_class_minver, default_class_majver;
+	int default_file_options, suppress_file_options;   // not header fields
+	int default_archive_modtime, default_file_modtime; // not header fields
+	int code_count;									// not a header field
+	int files_remaining;							   // not a header field
+
+	// engine state
+	band *all_bands;  // indexed by band_number
+	byte *meta_rp;	// read-pointer into (copy of) band_headers
+	constant_pool cp; // all constant pool information
+	inner_class *ics; // InnerClasses
+
+	// output stream
+	bytes output;  // output block (either classfile head or tail)
+	byte *wp;	  // write pointer (< wplimit == output.limit())
+	byte *wpbase;  // write pointer starting address (<= wp)
+	byte *wplimit; // how much of the output block has been written?
+
+	// output state
+	file cur_file;
+	entry *cur_class;	// CONSTANT_Class entry
+	entry *cur_super;	// CONSTANT_Class entry or nullptr
+	entry *cur_descr;	// CONSTANT_NameandType entry
+	int cur_descr_flags; // flags corresponding to cur_descr
+	int cur_class_minver, cur_class_majver;
+	bool cur_class_has_local_ics;
+	fillbytes cur_classfile_head;
+	fillbytes cur_classfile_tail;
+	int files_written;   // also tells which file we're working on
+	int classes_written; // also tells which class we're working on
+	uint64_t bytes_written;
+	intlist bcimap;
+	fillbytes class_fixup_type;
+	intlist class_fixup_offset;
+	ptrlist class_fixup_ref;
+	fillbytes code_fixup_type; // which format of branch operand?
+	intlist code_fixup_offset; // location of operand needing fixup
+	intlist code_fixup_source; // encoded ID of branch insn
+	ptrlist requested_ics;	 // which ics need output?
+
+	// stats pertaining to multiple segments (updated on reset)
+	uint64_t bytes_read_before_reset;
+	uint64_t bytes_written_before_reset;
+	int files_written_before_reset;
+	int classes_written_before_reset;
+	int segments_read_before_reset;
+
+	// attribute state
+	struct layout_definition
+	{
+		uint32_t idx;	 // index (0..31...) which identifies this layout
+		const char *name; // name of layout
+		entry *nameEntry;
+		const char *layout; // string of layout (not yet parsed)
+		band **elems;	   // array of top-level layout elems (or callables)
+
+		bool hasCallables()
+		{
+			return layout[0] == '[';
+		}
+		band **bands()
+		{
+			assert(elems != nullptr);
+			return elems;
+		}
+	};
+	struct attr_definitions
+	{
+		unpacker *u;		 // pointer to self, for U_NEW macro
+		int xxx_flags_hi_bn; // locator for flags, count, indexes, calls bands
+		int attrc;		   // ATTR_CONTEXT_CLASS, etc.
+		uint32_t flag_limit; // 32 or 63, depending on archive_options bit
+		uint64_t predef;	 // mask of built-in definitions
+		uint64_t redef;	  // mask of local flag definitions or redefinitions
+		ptrlist layouts;	 // local (compressor-defined) defs, in index order
+		int flag_count[X_ATTR_LIMIT_FLAGS_HI];
+		intlist overflow_count;
+		ptrlist strip_names;   // what attribute names are being stripped?
+		ptrlist band_stack;	// Temp., used during layout parsing.
+		ptrlist calls_to_link; //  (ditto)
+		int bands_made;		//  (ditto)
+
+		void free()
+		{
+			layouts.free();
+			overflow_count.free();
+			strip_names.free();
+			band_stack.free();
+			calls_to_link.free();
+		}
+
+		// Locate the five fixed bands.
+		band &xxx_flags_hi();
+		band &xxx_flags_lo();
+		band &xxx_attr_count();
+		band &xxx_attr_indexes();
+		band &xxx_attr_calls();
+		band &fixed_band(int e_class_xxx);
+
+		// Register a new layout, and make bands for it.
+		layout_definition *defineLayout(int idx, const char *name, const char *layout);
+		layout_definition *defineLayout(int idx, entry *nameEntry, const char *layout);
+		band **buildBands(layout_definition *lo);
+
+		// Parse a layout string or part of one, recursively if necessary.
+		const char *parseLayout(const char *lp, band **&res, int curCble);
+		const char *parseNumeral(const char *lp, int &res);
+		const char *parseIntLayout(const char *lp, band *&res, byte le_kind,
+								   bool can_be_signed = false);
+		band **popBody(int band_stack_base); // pops a body off band_stack
+
+		// Read data into the bands of the idx-th layout.
+		void readBandData(int idx);					 // parse layout, make bands, read data
+		void readBandData(band **body, uint32_t count); // recursive helper
+
+		layout_definition *getLayout(uint32_t idx)
+		{
+			if (idx >= (uint32_t)layouts.length())
+				return nullptr;
+			return (layout_definition *)layouts.get(idx);
+		}
+
+		void setHaveLongFlags(bool z)
+		{
+			assert(flag_limit == 0); // not set up yet
+			flag_limit = (z ? X_ATTR_LIMIT_FLAGS_HI : X_ATTR_LIMIT_NO_FLAGS_HI);
+		}
+		bool haveLongFlags()
+		{
+			assert(flag_limit == X_ATTR_LIMIT_NO_FLAGS_HI ||
+				   flag_limit == X_ATTR_LIMIT_FLAGS_HI);
+			return flag_limit == X_ATTR_LIMIT_FLAGS_HI;
+		}
+
+		// Return flag_count if idx is predef and not redef, else zero.
+		int predefCount(uint32_t idx);
+
+		bool isRedefined(uint32_t idx)
+		{
+			if (idx >= flag_limit)
+				return false;
+			return (bool)((redef >> idx) & 1);
+		}
+		bool isPredefined(uint32_t idx)
+		{
+			if (idx >= flag_limit)
+				return false;
+			return (bool)(((predef & ~redef) >> idx) & 1);
+		}
+		uint64_t flagIndexMask()
+		{
+			return (predef | redef);
+		}
+		bool isIndex(uint32_t idx)
+		{
+			assert(flag_limit != 0); // must be set up already
+			if (idx < flag_limit)
+				return (bool)(((predef | redef) >> idx) & 1);
+			else
+				return (idx - flag_limit < (uint32_t)overflow_count.length());
+		}
+		int &getCount(uint32_t idx)
+		{
+			assert(isIndex(idx));
+			if (idx < flag_limit)
+				return flag_count[idx];
+			else
+				return overflow_count.get(idx - flag_limit);
+		}
+	};
+
+	attr_definitions attr_defs[ATTR_CONTEXT_LIMIT];
+
+	// Initialization
+	void init(read_input_fn_t input_fn = nullptr);
+	// Resets to a known sane state
+	void reset();
+	// Deallocates all storage.
+	void free();
+	// Deallocates temporary storage (volatile after next client call).
+	void free_temps()
+	{
+		tsmallbuf.init();
+		tmallocs.freeAll();
+	}
+
+	// Option management methods
+	bool set_option(const char *option, const char *value);
+	const char *get_option(const char *option);
+
+	// Fetching input.
+	bool ensure_input(int64_t more);
+	byte *input_scan()
+	{
+		return rp;
+	}
+	size_t input_remaining()
+	{
+		return rplimit - rp;
+	}
+	size_t input_consumed()
+	{
+		return rp - input.base();
+	}
+
+	// Entry points to the unpack engine
+	static int run(int argc, char **argv); // Unix-style entry point.
+	void check_options();
+	void start(void *packptr = nullptr, size_t len = 0);
+	void write_file_to_jar(file *f);
+	void finish();
+
+	// Public post unpack methods
+	int get_files_remaining()
+	{
+		return files_remaining;
+	}
+	int get_segments_remaining()
+	{
+		return archive_next_count;
+	}
+	file *get_next_file(); // returns nullptr on last file
+
+	// General purpose methods
+	void *alloc(size_t size)
+	{
+		return alloc_heap(size, true);
+	}
+	void *temp_alloc(size_t size)
+	{
+		return alloc_heap(size, true, true);
+	}
+	void *alloc_heap(size_t size, bool smallOK = false, bool temp = false);
+	void saveTo(bytes &b, const char *str)
+	{
+		saveTo(b, (byte *)str, strlen(str));
+	}
+	void saveTo(bytes &b, bytes &data)
+	{
+		saveTo(b, data.ptr, data.len);
+	}
+	void saveTo(bytes &b, byte *ptr, size_t len); //{ b.ptr = U_NEW...}
+	const char *saveStr(const char *str)
+	{
+		bytes buf;
+		saveTo(buf, str);
+		return buf.strval();
+	}
+	const char *saveIntStr(int num)
+	{
+		char buf[30];
+		sprintf(buf, "%d", num);
+		return saveStr(buf);
+	}
+	static unpacker *current(); // find current instance
+
+	// Output management
+	void set_output(fillbytes *which)
+	{
+		assert(wp == nullptr);
+		which->ensureSize(1 << 12); // covers the average classfile
+		wpbase = which->base();
+		wp = which->limit();
+		wplimit = which->end();
+	}
+	fillbytes *close_output(fillbytes *which = nullptr); // inverse of set_output
+
+	// These take an implicit parameter of wp/wplimit, and resize as necessary:
+	byte *put_space(size_t len); // allocates space at wp, returns pointer
+	size_t put_empty(size_t s)
+	{
+		byte *p = put_space(s);
+		return p - wpbase;
+	}
+	void ensure_put_space(size_t len);
+	void put_bytes(bytes &b)
+	{
+		b.writeTo(put_space(b.len));
+	}
+	void putu1(int n)
+	{
+		putu1_at(put_space(1), n);
+	}
+	void putu1_fast(int n)
+	{
+		putu1_at(wp++, n);
+	}
+	void putu2(int n);					// { putu2_at(put_space(2), n); }
+	void putu4(int n);					// { putu4_at(put_space(4), n); }
+	void putu8(int64_t n);				// { putu8_at(put_space(8), n); }
+	void putref(entry *e);				// { putu2_at(put_space(2), putref_index(e, 2)); }
+	void putu1ref(entry *e);			  // { putu1_at(put_space(1), putref_index(e, 1)); }
+	int putref_index(entry *e, int size); // size in [1..2]
+	void put_label(int curIP, int size);  // size in {2,4}
+	void putlayout(band **body);
+	void put_stackmap_type();
+
+	size_t wpoffset()
+	{
+		return (size_t)(wp - wpbase);
+	} // (unvariant across overflow)
+	byte *wp_at(size_t offset)
+	{
+		return wpbase + offset;
+	}
+	uint32_t to_bci(uint32_t bii);
+	void get_code_header(int &max_stack, int &max_na_locals, int &handler_count, int &cflags);
+	band *ref_band_for_self_op(int bc, bool &isAloadVar, int &origBCVar);
+	band *ref_band_for_op(int bc);
+
+	// Definitions of standard classfile int formats:
+	static void putu1_at(byte *wp, int n)
+	{
+		assert(n == (n & 0xFF));
+		wp[0] = n;
+	}
+	static void putu2_at(byte *wp, int n);
+	static void putu4_at(byte *wp, int n);
+	static void putu8_at(byte *wp, int64_t n);
+
+	// Private stuff
+	void reset_cur_classfile();
+	void write_classfile_tail();
+	void write_classfile_head();
+	void write_code();
+	void write_bc_ops();
+	void write_members(int num, int attrc); // attrc=ATTR_CONTEXT_FIELD/METHOD
+	int write_attrs(int attrc, uint64_t indexBits);
+
+	// The readers
+	void read_bands();
+	void read_file_header();
+	void read_cp();
+	void read_cp_counts(value_stream &hdr);
+	void read_attr_defs();
+	void read_ics();
+	void read_attrs(int attrc, int obj_count);
+	void read_classes();
+	void read_code_headers();
+	void read_bcs();
+	void read_bc_ops();
+	void read_files();
+	void read_Utf8_values(entry *cpMap, int len);
+	void read_single_words(band &cp_band, entry *cpMap, int len);
+	void read_double_words(band &cp_bands, entry *cpMap, int len);
+	void read_single_refs(band &cp_band, byte refTag, entry *cpMap, int len);
+	void read_double_refs(band &cp_band, byte ref1Tag, byte ref2Tag, entry *cpMap, int len);
+	void read_signature_values(entry *cpMap, int len);
+};
diff --git a/libraries/pack200/src/unpack200.cpp b/libraries/pack200/src/unpack200.cpp
new file mode 100644
index 00000000..22b7f3b0
--- /dev/null
+++ b/libraries/pack200/src/unpack200.cpp
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <assert.h>
+#include <limits.h>
+#include <time.h>
+#include <stdint.h>
+
+#include "constants.h"
+#include "utils.h"
+#include "defines.h"
+#include "bytes.h"
+#include "coding.h"
+#include "unpack200.h"
+#include "unpack.h"
+#include "zip.h"
+
+// Callback for fetching data, Unix style.
+static int64_t read_input_via_stdio(unpacker *u, void *buf, int64_t minlen, int64_t maxlen)
+{
+	assert(u->infileptr != nullptr);
+	assert(minlen <= maxlen); // don't talk nonsense
+	int64_t numread = 0;
+	char *bufptr = (char *)buf;
+	while (numread < minlen)
+	{
+		// read available input, up to buf.length or maxlen
+		int readlen = (1 << 16);
+		if (readlen > (maxlen - numread))
+			readlen = (int)(maxlen - numread);
+		int nr = 0;
+
+		nr = (int)fread(bufptr, 1, readlen, u->infileptr);
+		if (nr <= 0)
+		{
+			if (errno != EINTR)
+				break;
+			nr = 0;
+		}
+		numread += nr;
+		bufptr += nr;
+		assert(numread <= maxlen);
+	}
+	return numread;
+}
+
+enum
+{
+	EOF_MAGIC = 0,
+	BAD_MAGIC = -1
+};
+
+static int read_magic(unpacker *u, char peek[], int peeklen)
+{
+	assert(peeklen == 4); // magic numbers are always 4 bytes
+	int64_t nr = (u->read_input_fn)(u, peek, peeklen, peeklen);
+	if (nr != peeklen)
+	{
+		return (nr == 0) ? EOF_MAGIC : BAD_MAGIC;
+	}
+	int magic = 0;
+	for (int i = 0; i < peeklen; i++)
+	{
+		magic <<= 8;
+		magic += peek[i] & 0xFF;
+	}
+	return magic;
+}
+
+void unpack_200(FILE *input, FILE *output)
+{
+	unpacker u;
+	u.init(read_input_via_stdio);
+
+	// initialize jar output
+	// the output takes ownership of the file handle
+	jar jarout;
+	jarout.init(&u);
+	jarout.jarfp = output;
+
+	// the input doesn't
+	u.infileptr = input;
+
+	// read the magic!
+	char peek[4];
+	int magic;
+	magic = read_magic(&u, peek, (int)sizeof(peek));
+
+	// if it is a gzip encoded file, we need an extra gzip input filter
+	if ((magic & GZIP_MAGIC_MASK) == GZIP_MAGIC)
+	{
+		gunzip *gzin = NEW(gunzip, 1);
+		gzin->init(&u);
+		// FIXME: why the side effects? WHY?
+		u.gzin->start(magic);
+		u.start();
+	}
+	else
+	{
+		// otherwise, feed the bytes to the unpacker directly
+		u.start(peek, sizeof(peek));
+	}
+
+	// Note:  The checks to u.aborting() are necessary to gracefully
+	// terminate processing when the first segment throws an error.
+	for (;;)
+	{
+		// Each trip through this loop unpacks one segment
+		// and then resets the unpacker.
+		for (unpacker::file *filep; (filep = u.get_next_file()) != nullptr;)
+		{
+			u.write_file_to_jar(filep);
+		}
+
+		// Peek ahead for more data.
+		magic = read_magic(&u, peek, (int)sizeof(peek));
+		if (magic != (int)JAVA_PACKAGE_MAGIC)
+		{
+			// we do not feel strongly about this kind of thing...
+			/*
+			if (magic != EOF_MAGIC)
+				unpack_abort("garbage after end of pack archive");
+			*/
+			break; // all done
+		}
+
+		// Release all storage from parsing the old segment.
+		u.reset();
+		// Restart, beginning with the peek-ahead.
+		u.start(peek, sizeof(peek));
+	}
+	u.finish();
+	u.free(); // tidy up malloc blocks
+	fclose(input);
+}
diff --git a/libraries/pack200/src/utils.cpp b/libraries/pack200/src/utils.cpp
new file mode 100644
index 00000000..0b7d91ca
--- /dev/null
+++ b/libraries/pack200/src/utils.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <assert.h>
+#include <stdint.h>
+
+#include <sys/stat.h>
+
+#ifdef _MSC_VER
+#include <direct.h>
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
+
+#include "constants.h"
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+
+#include "unpack.h"
+
+void *must_malloc(size_t size)
+{
+	size_t msize = size;
+	void *ptr = (msize > PSIZE_MAX) ? nullptr : malloc(msize);
+	if (ptr != nullptr)
+	{
+		memset(ptr, 0, size);
+	}
+	else
+	{
+		throw std::runtime_error(ERROR_ENOMEM);
+	}
+	return ptr;
+}
+
+void unpack_abort(const char *msg)
+{
+	if (msg == nullptr)
+		msg = "corrupt pack file or internal error";
+	throw std::runtime_error(msg);
+}
diff --git a/libraries/pack200/src/utils.h b/libraries/pack200/src/utils.h
new file mode 100644
index 00000000..5a3dc8f6
--- /dev/null
+++ b/libraries/pack200/src/utils.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// Definitions of our util functions
+
+#include <stdexcept>
+
+void *must_malloc(size_t size);
+
+// overflow management
+#define OVERFLOW ((size_t) - 1)
+#define PSIZE_MAX (OVERFLOW / 2) /* normal size limit */
+
+inline size_t scale_size(size_t size, size_t scale)
+{
+	return (size > PSIZE_MAX / scale) ? OVERFLOW : size * scale;
+}
+
+inline size_t add_size(size_t size1, size_t size2)
+{
+	return ((size1 | size2 | (size1 + size2)) > PSIZE_MAX) ? OVERFLOW : size1 + size2;
+}
+
+inline size_t add_size(size_t size1, size_t size2, int size3)
+{
+	return add_size(add_size(size1, size2), size3);
+}
+
+struct unpacker;
+/// This throws an exception!
+extern void unpack_abort(const char *msg = nullptr);
diff --git a/libraries/pack200/src/zip.cpp b/libraries/pack200/src/zip.cpp
new file mode 100644
index 00000000..32e8bd50
--- /dev/null
+++ b/libraries/pack200/src/zip.cpp
@@ -0,0 +1,589 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Note: Lifted from uncrunch.c from jdk sources
+ */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <stdint.h>
+
+#include <stdlib.h>
+#include <assert.h>
+
+#ifndef _MSC_VER
+#include <strings.h>
+#endif
+
+#include "defines.h"
+#include "bytes.h"
+#include "utils.h"
+
+#include "constants.h"
+#include "unpack.h"
+
+#include "zip.h"
+
+#include "zlib.h"
+
+inline uint32_t jar::get_crc32(uint32_t c, uchar *ptr, uint32_t len)
+{
+	return crc32(c, ptr, len);
+}
+
+// FIXME: this is bullshit. Do real endianness detection.
+#ifdef sparc
+#define SWAP_BYTES(a) ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
+#else
+#define SWAP_BYTES(a) (a)
+#endif
+
+#define GET_INT_LO(a) SWAP_BYTES(a & 0xFFFF)
+
+#define GET_INT_HI(a) SWAP_BYTES((a >> 16) & 0xFFFF);
+
+void jar::init(unpacker *u_)
+{
+	BYTES_OF(*this).clear();
+	u = u_;
+	u->jarout = this;
+}
+
+// Write data to the ZIP output stream.
+void jar::write_data(void *buff, int len)
+{
+	while (len > 0)
+	{
+		int rc = (int)fwrite(buff, 1, len, jarfp);
+		if (rc <= 0)
+		{
+			fprintf(stderr, "Error: write on output file failed err=%d\n", errno);
+			exit(1); // Called only from the native standalone unpacker
+		}
+		output_file_offset += rc;
+		buff = ((char *)buff) + rc;
+		len -= rc;
+	}
+}
+
+void jar::add_to_jar_directory(const char *fname, bool store, int modtime, int len, int clen,
+							   uint32_t crc)
+{
+	uint32_t fname_length = (uint32_t)strlen(fname);
+	ushort header[23];
+	if (modtime == 0)
+		modtime = default_modtime;
+	uint32_t dostime = get_dostime(modtime);
+
+	header[0] = (ushort)SWAP_BYTES(0x4B50);
+	header[1] = (ushort)SWAP_BYTES(0x0201);
+	header[2] = (ushort)SWAP_BYTES(0xA);
+
+	// required version
+	header[3] = (ushort)SWAP_BYTES(0xA);
+
+	// flags 02 = maximum  sub-compression flag
+	header[4] = (store) ? 0x0 : SWAP_BYTES(0x2);
+
+	// Compression method 8=deflate.
+	header[5] = (store) ? 0x0 : SWAP_BYTES(0x08);
+
+	// Last modified date and time.
+	header[6] = (ushort)GET_INT_LO(dostime);
+	header[7] = (ushort)GET_INT_HI(dostime);
+
+	// CRC
+	header[8] = (ushort)GET_INT_LO(crc);
+	header[9] = (ushort)GET_INT_HI(crc);
+
+	// Compressed length:
+	header[10] = (ushort)GET_INT_LO(clen);
+	header[11] = (ushort)GET_INT_HI(clen);
+
+	// Uncompressed length.
+	header[12] = (ushort)GET_INT_LO(len);
+	header[13] = (ushort)GET_INT_HI(len);
+
+	// Filename length
+	header[14] = (ushort)SWAP_BYTES(fname_length);
+	// So called "extra field" length.
+	header[15] = 0;
+	// So called "comment" length.
+	header[16] = 0;
+	// Disk number start
+	header[17] = 0;
+	// File flags => binary
+	header[18] = 0;
+	// More file flags
+	header[19] = 0;
+	header[20] = 0;
+	// Offset within ZIP file.
+	header[21] = (ushort)GET_INT_LO(output_file_offset);
+	header[22] = (ushort)GET_INT_HI(output_file_offset);
+
+	// Copy the whole thing into the central directory.
+	central_directory.append(header, sizeof(header));
+
+	// Copy the fname to the header.
+	central_directory.append(fname, fname_length);
+
+	central_directory_count++;
+}
+
+void jar::write_jar_header(const char *fname, bool store, int modtime, int len, int clen,
+						   uint32_t crc)
+{
+	uint32_t fname_length = (uint32_t)strlen(fname);
+	ushort header[15];
+	if (modtime == 0)
+		modtime = default_modtime;
+	uint32_t dostime = get_dostime(modtime);
+
+	// ZIP LOC magic.
+	header[0] = (ushort)SWAP_BYTES(0x4B50);
+	header[1] = (ushort)SWAP_BYTES(0x0403);
+
+	// Version
+	header[2] = (ushort)SWAP_BYTES(0xA);
+
+	// flags 02 = maximum  sub-compression flag
+	header[3] = (store) ? 0x0 : SWAP_BYTES(0x2);
+
+	// Compression method = deflate
+	header[4] = (store) ? 0x0 : SWAP_BYTES(0x08);
+
+	// Last modified date and time.
+	header[5] = (ushort)GET_INT_LO(dostime);
+	header[6] = (ushort)GET_INT_HI(dostime);
+
+	// CRC
+	header[7] = (ushort)GET_INT_LO(crc);
+	header[8] = (ushort)GET_INT_HI(crc);
+
+	// Compressed length:
+	header[9] = (ushort)GET_INT_LO(clen);
+	header[10] = (ushort)GET_INT_HI(clen);
+
+	// Uncompressed length.
+	header[11] = (ushort)GET_INT_LO(len);
+	header[12] = (ushort)GET_INT_HI(len);
+
+	// Filename length
+	header[13] = (ushort)SWAP_BYTES(fname_length);
+	// So called "extra field" length.
+	header[14] = 0;
+
+	// Write the LOC header to the output file.
+	write_data(header, (int)sizeof(header));
+
+	// Copy the fname to the header.
+	write_data((char *)fname, (int)fname_length);
+}
+
+void jar::write_central_directory()
+{
+	bytes mc;
+	mc.set("PACK200");
+
+	ushort header[11];
+
+	// Create the End of Central Directory structure.
+	header[0] = (ushort)SWAP_BYTES(0x4B50);
+	header[1] = (ushort)SWAP_BYTES(0x0605);
+	// disk numbers
+	header[2] = 0;
+	header[3] = 0;
+	// Number of entries in central directory.
+	header[4] = (ushort)SWAP_BYTES(central_directory_count);
+	header[5] = (ushort)SWAP_BYTES(central_directory_count);
+	// Size of the central directory}
+	header[6] = (ushort)GET_INT_LO((int)central_directory.size());
+	header[7] = (ushort)GET_INT_HI((int)central_directory.size());
+	// Offset of central directory within disk.
+	header[8] = (ushort)GET_INT_LO(output_file_offset);
+	header[9] = (ushort)GET_INT_HI(output_file_offset);
+	// zipfile comment length;
+	header[10] = (ushort)SWAP_BYTES((int)mc.len);
+
+	// Write the central directory.
+	write_data(central_directory.b);
+
+	// Write the End of Central Directory structure.
+	write_data(header, (int)sizeof(header));
+
+	// Write the comment.
+	write_data(mc);
+}
+
+// Public API
+
+// Open a Jar file and initialize.
+void jar::openJarFile(const char *fname)
+{
+	if (!jarfp)
+	{
+		jarfp = fopen(fname, "wb");
+		if (!jarfp)
+		{
+			fprintf(stderr, "Error: Could not open jar file: %s\n", fname);
+			exit(3); // Called only from the native standalone unpacker
+		}
+	}
+}
+
+// Add a ZIP entry and copy the file data
+void jar::addJarEntry(const char *fname, bool deflate_hint, int modtime, bytes &head,
+					  bytes &tail)
+{
+	int len = (int)(head.len + tail.len);
+	int clen = 0;
+
+	uint32_t crc = get_crc32(0, Z_NULL, 0);
+	if (head.len != 0)
+		crc = get_crc32(crc, (uchar *)head.ptr, (uint32_t)head.len);
+	if (tail.len != 0)
+		crc = get_crc32(crc, (uchar *)tail.ptr, (uint32_t)tail.len);
+
+	bool deflate = (deflate_hint && len > 0);
+
+	if (deflate)
+	{
+		if (deflate_bytes(head, tail) == false)
+		{
+			deflate = false;
+		}
+	}
+	clen = (int)((deflate) ? deflated.size() : len);
+	add_to_jar_directory(fname, !deflate, modtime, len, clen, crc);
+	write_jar_header(fname, !deflate, modtime, len, clen, crc);
+
+	if (deflate)
+	{
+		write_data(deflated.b);
+	}
+	else
+	{
+		write_data(head);
+		write_data(tail);
+	}
+}
+
+// Add a ZIP entry for a directory name no data
+void jar::addDirectoryToJarFile(const char *dir_name)
+{
+	bool store = true;
+	add_to_jar_directory((const char *)dir_name, store, default_modtime, 0, 0, 0);
+	write_jar_header((const char *)dir_name, store, default_modtime, 0, 0, 0);
+}
+
+// Write out the central directory and close the jar file.
+void jar::closeJarFile(bool central)
+{
+	if (jarfp)
+	{
+		fflush(jarfp);
+		if (central)
+			write_central_directory();
+		fflush(jarfp);
+		fclose(jarfp);
+	}
+	reset();
+}
+
+/* Convert the date y/n/d and time h:m:s to a four byte DOS date and
+ *  time (date in high two bytes, time in low two bytes allowing magnitude
+ *  comparison).
+ */
+inline uint32_t jar::dostime(int y, int n, int d, int h, int m, int s)
+{
+	return y < 1980 ? dostime(1980, 1, 1, 0, 0, 0)
+					: (((uint32_t)y - 1980) << 25) | ((uint32_t)n << 21) | ((uint32_t)d << 16) |
+						  ((uint32_t)h << 11) | ((uint32_t)m << 5) | ((uint32_t)s >> 1);
+}
+/*
+#ifdef _REENTRANT // solaris
+extern "C" struct tm *gmtime_r(const time_t *, struct tm *);
+#else
+#define gmtime_r(t, s) gmtime(t)
+#endif
+*/
+/*
+ * Return the Unix time in DOS format
+ */
+uint32_t jar::get_dostime(int modtime)
+{
+	// see defines.h
+	if (modtime != 0 && modtime == modtime_cache)
+		return dostime_cache;
+	if (modtime != 0 && default_modtime == 0)
+		default_modtime = modtime; // catch a reasonable default
+	time_t t = modtime;
+	struct tm sbuf;
+	(void)memset((void *)&sbuf, 0, sizeof(sbuf));
+	struct tm *s = gmtime_r(&t, &sbuf);
+	modtime_cache = modtime;
+	dostime_cache =
+		dostime(s->tm_year + 1900, s->tm_mon + 1, s->tm_mday, s->tm_hour, s->tm_min, s->tm_sec);
+	// printf("modtime %d => %d\n", modtime_cache, dostime_cache);
+	return dostime_cache;
+}
+
+/* Returns true on success, and will set the clen to the compressed
+   length, the caller should verify if true and clen less than the
+   input data
+*/
+bool jar::deflate_bytes(bytes &head, bytes &tail)
+{
+	int len = (int)(head.len + tail.len);
+
+	z_stream zs;
+	BYTES_OF(zs).clear();
+
+	// NOTE: the window size should always be -MAX_WBITS normally -15.
+	// unzip/zipup.c and java/Deflater.c
+
+	int error =
+		deflateInit2(&zs, Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
+	if (error != Z_OK)
+	{
+		/*
+		switch (error)
+		{
+		case Z_MEM_ERROR:
+			PRINTCR((2, "Error: deflate error : Out of memory \n"));
+			break;
+		case Z_STREAM_ERROR:
+			PRINTCR((2, "Error: deflate error : Invalid compression level \n"));
+			break;
+		case Z_VERSION_ERROR:
+			PRINTCR((2, "Error: deflate error : Invalid version\n"));
+			break;
+		default:
+			PRINTCR((2, "Error: Internal deflate error error = %d\n", error));
+		}
+		*/
+		return false;
+	}
+
+	deflated.empty();
+	zs.next_out = (uchar *)deflated.grow(len + (len / 2));
+	zs.avail_out = (int)deflated.size();
+
+	zs.next_in = (uchar *)head.ptr;
+	zs.avail_in = (int)head.len;
+
+	bytes *first = &head;
+	bytes *last = &tail;
+	if (last->len == 0)
+	{
+		first = nullptr;
+		last = &head;
+	}
+	else if (first->len == 0)
+	{
+		first = nullptr;
+	}
+
+	if (first != nullptr && error == Z_OK)
+	{
+		zs.next_in = (uchar *)first->ptr;
+		zs.avail_in = (int)first->len;
+		error = deflate(&zs, Z_NO_FLUSH);
+	}
+	if (error == Z_OK)
+	{
+		zs.next_in = (uchar *)last->ptr;
+		zs.avail_in = (int)last->len;
+		error = deflate(&zs, Z_FINISH);
+	}
+	if (error == Z_STREAM_END)
+	{
+		if (len > (int)zs.total_out)
+		{
+			deflated.b.len = zs.total_out;
+			deflateEnd(&zs);
+			return true;
+		}
+		deflateEnd(&zs);
+		return false;
+	}
+
+	deflateEnd(&zs);
+	return false;
+}
+
+// Callback for fetching data from a GZIP input stream
+static int64_t read_input_via_gzip(unpacker *u, void *buf, int64_t minlen, int64_t maxlen)
+{
+	assert(minlen <= maxlen); // don't talk nonsense
+	int64_t numread = 0;
+	char *bufptr = (char *)buf;
+	char *inbuf = u->gzin->inbuf;
+	size_t inbuflen = sizeof(u->gzin->inbuf);
+	unpacker::read_input_fn_t read_gzin_fn = (unpacker::read_input_fn_t)u->gzin->read_input_fn;
+	z_stream &zs = *(z_stream *)u->gzin->zstream;
+	while (numread < minlen)
+	{
+		int readlen = (1 << 16); // pretty arbitrary
+		if (readlen > (maxlen - numread))
+			readlen = (int)(maxlen - numread);
+		zs.next_out = (uchar *)bufptr;
+		zs.avail_out = readlen;
+		if (zs.avail_in == 0)
+		{
+			zs.avail_in = (int)read_gzin_fn(u, inbuf, 1, inbuflen);
+			zs.next_in = (uchar *)inbuf;
+		}
+		int error = inflate(&zs, Z_NO_FLUSH);
+		if (error != Z_OK && error != Z_STREAM_END)
+		{
+			unpack_abort("error inflating input");
+			break;
+		}
+		int nr = readlen - zs.avail_out;
+		numread += nr;
+		bufptr += nr;
+		assert(numread <= maxlen);
+		if (error == Z_STREAM_END)
+		{
+			enum
+			{
+				TRAILER_LEN = 8
+			};
+			// skip 8-byte trailer
+			if (zs.avail_in >= TRAILER_LEN)
+			{
+				zs.avail_in -= TRAILER_LEN;
+			}
+			else
+			{
+				// Bug: 5023768,we read past the TRAILER_LEN to see if there is
+				// any extraneous data, as we dont support concatenated .gz
+				// files just yet.
+				int extra = (int)read_gzin_fn(u, inbuf, 1, inbuflen);
+				zs.avail_in += extra - TRAILER_LEN;
+			}
+			// %%% should check final CRC and length here
+			// %%% should check for concatenated *.gz files here
+			if (zs.avail_in > 0)
+				unpack_abort("garbage after end of deflated input stream");
+			// pop this filter off:
+			u->gzin->free();
+			break;
+		}
+	}
+
+	// fprintf(u->errstrm, "readInputFn(%d,%d) => %d (gunzip)\n",
+	//        (int)minlen, (int)maxlen, (int)numread);
+	return numread;
+}
+
+void gunzip::init(unpacker *u_)
+{
+	BYTES_OF(*this).clear();
+	u = u_;
+	assert(u->gzin == nullptr); // once only, please
+	read_input_fn = (void *)u->read_input_fn;
+	zstream = NEW(z_stream, 1);
+	u->gzin = this;
+	u->read_input_fn = read_input_via_gzip;
+}
+
+void gunzip::start(int magic)
+{
+	assert((magic & GZIP_MAGIC_MASK) == GZIP_MAGIC);
+	int gz_flg = (magic & 0xFF); // keep "flg", discard other 3 bytes
+	enum
+	{
+		FHCRC = (1 << 1),
+		FEXTRA = (1 << 2),
+		FNAME = (1 << 3),
+		FCOMMENT = (1 << 4)
+	};
+	char gz_mtime[4];
+	char gz_xfl[1];
+	char gz_os[1];
+	char gz_extra_len[2];
+	char gz_hcrc[2];
+	char gz_ignore;
+	// do not save extra, name, comment
+	read_fixed_field(gz_mtime, sizeof(gz_mtime));
+	read_fixed_field(gz_xfl, sizeof(gz_xfl));
+	read_fixed_field(gz_os, sizeof(gz_os));
+	if (gz_flg & FEXTRA)
+	{
+		read_fixed_field(gz_extra_len, sizeof(gz_extra_len));
+		int extra_len = gz_extra_len[0] & 0xFF;
+		extra_len += (gz_extra_len[1] & 0xFF) << 8;
+		for (; extra_len > 0; extra_len--)
+		{
+			read_fixed_field(&gz_ignore, 1);
+		}
+	}
+	int null_terms = 0;
+	if (gz_flg & FNAME)
+		null_terms++;
+	if (gz_flg & FCOMMENT)
+		null_terms++;
+	for (; null_terms; null_terms--)
+	{
+		for (;;)
+		{
+			gz_ignore = 0;
+			read_fixed_field(&gz_ignore, 1);
+			if (gz_ignore == 0)
+				break;
+		}
+	}
+	if (gz_flg & FHCRC)
+		read_fixed_field(gz_hcrc, sizeof(gz_hcrc));
+
+	// now the input stream is ready to read into the inflater
+	int error = inflateInit2((z_stream *)zstream, -MAX_WBITS);
+	if (error != Z_OK)
+	{
+		unpack_abort("cannot create input");
+	}
+}
+
+void gunzip::free()
+{
+	assert(u->gzin == this);
+	u->gzin = nullptr;
+	u->read_input_fn = (unpacker::read_input_fn_t) this->read_input_fn;
+	inflateEnd((z_stream *)zstream);
+	::free(zstream);
+	zstream = nullptr;
+	::free(this);
+}
+
+void gunzip::read_fixed_field(char *buf, size_t buflen)
+{
+	int64_t nr = ((unpacker::read_input_fn_t)read_input_fn)(u, buf, buflen, buflen);
+	if ((size_t)nr != buflen)
+		unpack_abort("short stream header");
+}
diff --git a/libraries/pack200/src/zip.h b/libraries/pack200/src/zip.h
new file mode 100644
index 00000000..67ec24da
--- /dev/null
+++ b/libraries/pack200/src/zip.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+#include <stdint.h>
+typedef unsigned short ushort;
+typedef unsigned int uint32_t;
+typedef unsigned char uchar;
+
+struct unpacker;
+
+struct jar
+{
+	// JAR file writer
+	FILE *jarfp;
+	int default_modtime;
+
+	// Used by unix2dostime:
+	int modtime_cache;
+	uint32_t dostime_cache;
+
+	// Private members
+	fillbytes central_directory;
+	ushort central_directory_count;
+	uint32_t output_file_offset;
+	fillbytes deflated; // temporary buffer
+
+	// pointer to outer unpacker, for error checks etc.
+	unpacker *u;
+
+	// Public Methods
+	void openJarFile(const char *fname);
+	void addJarEntry(const char *fname, bool deflate_hint, int modtime, bytes &head,
+					 bytes &tail);
+	void addDirectoryToJarFile(const char *dir_name);
+	void closeJarFile(bool central);
+
+	void init(unpacker *u_);
+
+	void free()
+	{
+		central_directory.free();
+		deflated.free();
+	}
+
+	void reset()
+	{
+		free();
+		init(u);
+	}
+
+	// Private Methods
+	void write_data(void *ptr, int len);
+	void write_data(bytes &b)
+	{
+		write_data(b.ptr, (int)b.len);
+	}
+	void add_to_jar_directory(const char *fname, bool store, int modtime, int len, int clen,
+							  uint32_t crc);
+	void write_jar_header(const char *fname, bool store, int modtime, int len, int clen,
+						  unsigned int crc);
+	void write_central_directory();
+	uint32_t dostime(int y, int n, int d, int h, int m, int s);
+	uint32_t get_dostime(int modtime);
+
+	// The definitions of these depend on the NO_ZLIB option:
+	bool deflate_bytes(bytes &head, bytes &tail);
+	static uint32_t get_crc32(uint32_t c, unsigned char *ptr, uint32_t len);
+};
+
+struct gunzip
+{
+	// optional gzip input stream control block
+
+	// pointer to outer unpacker, for error checks etc.
+	unpacker *u;
+
+	void *read_input_fn; // underlying \bchar\b stream
+	void *zstream;	   // inflater state
+	char inbuf[1 << 14]; // input buffer
+
+	void init(unpacker *u_); // pushes new value on u->read_input_fn
+
+	void free();
+
+	void start(int magic);
+
+	// private stuff
+	void read_fixed_field(char *buf, size_t buflen);
+};
diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt
new file mode 100644
index 00000000..01342d1b
--- /dev/null
+++ b/libraries/rainbow/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+project(rainbow)
+
+find_package(Qt5Core REQUIRED QUIET)
+find_package(Qt5Gui REQUIRED QUIET)
+
+set(RAINBOW_SOURCES
+src/rainbow.cpp
+)
+
+add_definitions(-DRAINBOW_LIBRARY)
+add_library(rainbow SHARED ${RAINBOW_SOURCES})
+target_include_directories(rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+qt5_use_modules(rainbow Core Gui)
diff --git a/libraries/rainbow/COPYING.LIB b/libraries/rainbow/COPYING.LIB
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/libraries/rainbow/COPYING.LIB
diff --git a/libraries/rainbow/include/rainbow.h b/libraries/rainbow/include/rainbow.h
new file mode 100644
index 00000000..b12052b1
--- /dev/null
+++ b/libraries/rainbow/include/rainbow.h
@@ -0,0 +1,160 @@
+/* This was part of the KDE project - see KGuiAddons
+ * Copyright (C) 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
+ * Copyright (C) 2007 Olaf Schmidt <ojschmidt@kde.org>
+ * Copyright (C) 2007 Thomas Zander <zander@kde.org>
+ * Copyright (C) 2007 Zack Rusin <zack@kde.org>
+ * Copyright (C) 2015 Petr Mrazek <peterix@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "rainbow_config.h"
+
+#include <QPainter>
+class QColor;
+
+/**
+ * A set of methods used to work with colors.
+ */
+namespace Rainbow
+{
+/**
+ * Calculate the luma of a color. Luma is weighted sum of gamma-adjusted
+ * R'G'B' components of a color. The result is similar to qGray. The range
+ * is from 0.0 (black) to 1.0 (white).
+ *
+ * Rainbow::darken(), Rainbow::lighten() and Rainbow::shade()
+ * operate on the luma of a color.
+ *
+ * @see http://en.wikipedia.org/wiki/Luma_(video)
+ */
+RAINBOW_EXPORT qreal luma(const QColor &);
+
+/**
+ * Calculate hue, chroma and luma of a color in one call.
+ * @since 5.0
+ */
+RAINBOW_EXPORT void getHcy(const QColor &, qreal *hue, qreal *chroma, qreal *luma,
+						   qreal *alpha = 0);
+
+/**
+ * Calculate the contrast ratio between two colors, according to the
+ * W3C/WCAG2.0 algorithm, (Lmax + 0.05)/(Lmin + 0.05), where Lmax and Lmin
+ * are the luma values of the lighter color and the darker color,
+ * respectively.
+ *
+ * A contrast ration of 5:1 (result == 5.0) is the minimum for "normal"
+ * text to be considered readable (large text can go as low as 3:1). The
+ * ratio ranges from 1:1 (result == 1.0) to 21:1 (result == 21.0).
+ *
+ * @see Rainbow::luma
+ */
+RAINBOW_EXPORT qreal contrastRatio(const QColor &, const QColor &);
+
+/**
+ * Adjust the luma of a color by changing its distance from white.
+ *
+ * @li amount == 1.0 gives white
+ * @li amount == 0.5 results in a color whose luma is halfway between 1.0
+ * and that of the original color
+ * @li amount == 0.0 gives the original color
+ * @li amount == -1.0 gives a color that is 'twice as far from white' as
+ * the original color, that is luma(result) == 1.0 - 2*(1.0 - luma(color))
+ *
+ * @param amount factor by which to adjust the luma component of the color
+ * @param chromaInverseGain (optional) factor by which to adjust the chroma
+ * component of the color; 1.0 means no change, 0.0 maximizes chroma
+ * @see Rainbow::shade
+ */
+RAINBOW_EXPORT QColor
+lighten(const QColor &, qreal amount = 0.5, qreal chromaInverseGain = 1.0);
+
+/**
+ * Adjust the luma of a color by changing its distance from black.
+ *
+ * @li amount == 1.0 gives black
+ * @li amount == 0.5 results in a color whose luma is halfway between 0.0
+ * and that of the original color
+ * @li amount == 0.0 gives the original color
+ * @li amount == -1.0 gives a color that is 'twice as far from black' as
+ * the original color, that is luma(result) == 2*luma(color)
+ *
+ * @param amount factor by which to adjust the luma component of the color
+ * @param chromaGain (optional) factor by which to adjust the chroma
+ * component of the color; 1.0 means no change, 0.0 minimizes chroma
+ * @see Rainbow::shade
+ */
+RAINBOW_EXPORT QColor darken(const QColor &, qreal amount = 0.5, qreal chromaGain = 1.0);
+
+/**
+ * Adjust the luma and chroma components of a color. The amount is added
+ * to the corresponding component.
+ *
+ * @param lumaAmount amount by which to adjust the luma component of the
+ * color; 0.0 results in no change, -1.0 turns anything black, 1.0 turns
+ * anything white
+ * @param chromaAmount (optional) amount by which to adjust the chroma
+ * component of the color; 0.0 results in no change, -1.0 minimizes chroma,
+ * 1.0 maximizes chroma
+ * @see Rainbow::luma
+ */
+RAINBOW_EXPORT QColor shade(const QColor &, qreal lumaAmount, qreal chromaAmount = 0.0);
+
+/**
+ * Create a new color by tinting one color with another. This function is
+ * meant for creating additional colors withings the same class (background,
+ * foreground) from colors in a different class. Therefore when @p amount
+ * is low, the luma of @p base is mostly preserved, while the hue and
+ * chroma of @p color is mostly inherited.
+ *
+ * @param base color to be tinted
+ * @param color color with which to tint
+ * @param amount how strongly to tint the base; 0.0 gives @p base,
+ * 1.0 gives @p color
+ */
+RAINBOW_EXPORT QColor tint(const QColor &base, const QColor &color, qreal amount = 0.3);
+
+/**
+ * Blend two colors into a new color by linear combination.
+ * @code
+	QColor lighter = Rainbow::mix(myColor, Qt::white)
+ * @endcode
+ * @param c1 first color.
+ * @param c2 second color.
+ * @param bias weight to be used for the mix. @p bias <= 0 gives @p c1,
+ * @p bias >= 1 gives @p c2. @p bias == 0.5 gives a 50% blend of @p c1
+ * and @p c2.
+ */
+RAINBOW_EXPORT QColor mix(const QColor &c1, const QColor &c2, qreal bias = 0.5);
+
+/**
+ * Blend two colors into a new color by painting the second color over the
+ * first using the specified composition mode.
+ * @code
+	QColor white(Qt::white);
+	white.setAlphaF(0.5);
+	QColor lighter = Rainbow::overlayColors(myColor, white);
+   @endcode
+ * @param base the base color (alpha channel is ignored).
+ * @param paint the color to be overlayed onto the base color.
+ * @param comp the CompositionMode used to do the blending.
+ */
+RAINBOW_EXPORT QColor
+overlayColors(const QColor &base, const QColor &paint,
+			  QPainter::CompositionMode comp = QPainter::CompositionMode_SourceOver);
+}
diff --git a/libraries/gui/SkinUtils.h b/libraries/rainbow/include/rainbow_config.h
index 29dcd6a6..ccd500ed 100644
--- a/libraries/gui/SkinUtils.h
+++ b/libraries/rainbow/include/rainbow_config.h
@@ -13,13 +13,14 @@
  * limitations under the License.
  */
 
-#pragma once
+#include <QtCore/QtGlobal>
 
-#include <QPixmap>
-
-#include "multimc_gui_export.h"
-
-namespace SkinUtils
-{
-QPixmap MULTIMC_GUI_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64);
-}
+#ifdef RAINBOW_STATIC
+	#define RAINBOW_EXPORT
+#else
+	#ifdef RAINBOW_LIBRARY
+		#define RAINBOW_EXPORT Q_DECL_EXPORT
+	#else
+		#define RAINBOW_EXPORT Q_DECL_IMPORT
+	#endif
+#endif
\ No newline at end of file
diff --git a/libraries/rainbow/src/rainbow.cpp b/libraries/rainbow/src/rainbow.cpp
new file mode 100644
index 00000000..8502fcd0
--- /dev/null
+++ b/libraries/rainbow/src/rainbow.cpp
@@ -0,0 +1,365 @@
+/* This was part of the KDE project - see KGuiAddons
+ * Copyright (C) 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
+ * Copyright (C) 2007 Olaf Schmidt <ojschmidt@kde.org>
+ * Copyright (C) 2007 Thomas Zander <zander@kde.org>
+ * Copyright (C) 2007 Zack Rusin <zack@kde.org>
+ * Copyright (C) 2015 Petr Mrazek <peterix@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "../include/rainbow.h"
+
+#include <QColor>
+#include <QImage>
+#include <QtNumeric> // qIsNaN
+
+#include <math.h>
+
+//BEGIN internal helper functions
+
+static inline qreal wrap(qreal a, qreal d = 1.0)
+{
+	qreal r = fmod(a, d);
+	return (r < 0.0 ? d + r : (r > 0.0 ? r : 0.0));
+}
+
+// normalize: like qBound(a, 0.0, 1.0) but without needing the args and with
+// "safer" behavior on NaN (isnan(a) -> return 0.0)
+static inline qreal normalize(qreal a)
+{
+    return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// HCY color space
+
+#define HCY_REC 709 // use 709 for now
+#if HCY_REC == 601
+static const qreal yc[3] = {0.299, 0.587, 0.114};
+#elif HCY_REC == 709
+static const qreal yc[3] = {0.2126, 0.7152, 0.0722};
+#else // use Qt values
+static const qreal yc[3] = {0.34375, 0.5, 0.15625};
+#endif
+
+class KHCY
+{
+public:
+	explicit KHCY(const QColor &color)
+	{
+		qreal r = gamma(color.redF());
+		qreal g = gamma(color.greenF());
+		qreal b = gamma(color.blueF());
+		a = color.alphaF();
+
+		// luma component
+		y = lumag(r, g, b);
+
+		// hue component
+		qreal p = qMax(qMax(r, g), b);
+		qreal n = qMin(qMin(r, g), b);
+		qreal d = 6.0 * (p - n);
+		if (n == p)
+		{
+			h = 0.0;
+		}
+		else if (r == p)
+		{
+			h = ((g - b) / d);
+		}
+		else if (g == p)
+		{
+			h = ((b - r) / d) + (1.0 / 3.0);
+		}
+		else
+		{
+			h = ((r - g) / d) + (2.0 / 3.0);
+		}
+
+		// chroma component
+		if (r == g && g == b)
+		{
+			c = 0.0;
+		}
+		else
+		{
+			c = qMax((y - n) / y, (p - y) / (1 - y));
+		}
+	}
+	explicit KHCY(qreal h_, qreal c_, qreal y_, qreal a_ = 1.0)
+	{
+		h = h_;
+		c = c_;
+		y = y_;
+		a = a_;
+	}
+
+	QColor qColor() const
+	{
+		// start with sane component values
+		qreal _h = wrap(h);
+		qreal _c = normalize(c);
+		qreal _y = normalize(y);
+
+		// calculate some needed variables
+		qreal _hs = _h * 6.0, th, tm;
+		if (_hs < 1.0)
+		{
+			th = _hs;
+			tm = yc[0] + yc[1] * th;
+		}
+		else if (_hs < 2.0)
+		{
+			th = 2.0 - _hs;
+			tm = yc[1] + yc[0] * th;
+		}
+		else if (_hs < 3.0)
+		{
+			th = _hs - 2.0;
+			tm = yc[1] + yc[2] * th;
+		}
+		else if (_hs < 4.0)
+		{
+			th = 4.0 - _hs;
+			tm = yc[2] + yc[1] * th;
+		}
+		else if (_hs < 5.0)
+		{
+			th = _hs - 4.0;
+			tm = yc[2] + yc[0] * th;
+		}
+		else
+		{
+			th = 6.0 - _hs;
+			tm = yc[0] + yc[2] * th;
+		}
+
+		// calculate RGB channels in sorted order
+		qreal tn, to, tp;
+		if (tm >= _y)
+		{
+			tp = _y + _y * _c * (1.0 - tm) / tm;
+			to = _y + _y * _c * (th - tm) / tm;
+			tn = _y - (_y * _c);
+		}
+		else
+		{
+			tp = _y + (1.0 - _y) * _c;
+			to = _y + (1.0 - _y) * _c * (th - tm) / (1.0 - tm);
+			tn = _y - (1.0 - _y) * _c * tm / (1.0 - tm);
+		}
+
+		// return RGB channels in appropriate order
+		if (_hs < 1.0)
+		{
+			return QColor::fromRgbF(igamma(tp), igamma(to), igamma(tn), a);
+		}
+		else if (_hs < 2.0)
+		{
+			return QColor::fromRgbF(igamma(to), igamma(tp), igamma(tn), a);
+		}
+		else if (_hs < 3.0)
+		{
+			return QColor::fromRgbF(igamma(tn), igamma(tp), igamma(to), a);
+		}
+		else if (_hs < 4.0)
+		{
+			return QColor::fromRgbF(igamma(tn), igamma(to), igamma(tp), a);
+		}
+		else if (_hs < 5.0)
+		{
+			return QColor::fromRgbF(igamma(to), igamma(tn), igamma(tp), a);
+		}
+		else
+		{
+			return QColor::fromRgbF(igamma(tp), igamma(tn), igamma(to), a);
+		}
+	}
+
+	qreal h, c, y, a;
+	static qreal luma(const QColor &color)
+	{
+		return lumag(gamma(color.redF()), gamma(color.greenF()), gamma(color.blueF()));
+	}
+
+private:
+	static qreal gamma(qreal n)
+	{
+		return pow(normalize(n), 2.2);
+	}
+	static qreal igamma(qreal n)
+	{
+		return pow(normalize(n), 1.0 / 2.2);
+	}
+	static qreal lumag(qreal r, qreal g, qreal b)
+	{
+		return r * yc[0] + g * yc[1] + b * yc[2];
+	}
+};
+
+static inline qreal mixQreal(qreal a, qreal b, qreal bias)
+{
+	return a + (b - a) * bias;
+}
+//END internal helper functions
+
+qreal Rainbow::luma(const QColor &color)
+{
+	return KHCY::luma(color);
+}
+
+void Rainbow::getHcy(const QColor &color, qreal *h, qreal *c, qreal *y, qreal *a)
+{
+	if (!c || !h || !y)
+	{
+		return;
+	}
+	KHCY khcy(color);
+	*c = khcy.c;
+	*h = khcy.h;
+	*y = khcy.y;
+	if (a)
+	{
+		*a = khcy.a;
+	}
+}
+
+static qreal contrastRatioForLuma(qreal y1, qreal y2)
+{
+	if (y1 > y2)
+	{
+		return (y1 + 0.05) / (y2 + 0.05);
+	}
+	else
+	{
+		return (y2 + 0.05) / (y1 + 0.05);
+	}
+}
+
+qreal Rainbow::contrastRatio(const QColor &c1, const QColor &c2)
+{
+	return contrastRatioForLuma(luma(c1), luma(c2));
+}
+
+QColor Rainbow::lighten(const QColor &color, qreal ky, qreal kc)
+{
+	KHCY c(color);
+	c.y = 1.0 - normalize((1.0 - c.y) * (1.0 - ky));
+	c.c = 1.0 - normalize((1.0 - c.c) * kc);
+	return c.qColor();
+}
+
+QColor Rainbow::darken(const QColor &color, qreal ky, qreal kc)
+{
+	KHCY c(color);
+	c.y = normalize(c.y * (1.0 - ky));
+	c.c = normalize(c.c * kc);
+	return c.qColor();
+}
+
+QColor Rainbow::shade(const QColor &color, qreal ky, qreal kc)
+{
+	KHCY c(color);
+	c.y = normalize(c.y + ky);
+	c.c = normalize(c.c + kc);
+	return c.qColor();
+}
+
+static QColor tintHelper(const QColor &base, qreal baseLuma, const QColor &color, qreal amount)
+{
+	KHCY result(Rainbow::mix(base, color, pow(amount, 0.3)));
+	result.y = mixQreal(baseLuma, result.y, amount);
+
+	return result.qColor();
+}
+
+QColor Rainbow::tint(const QColor &base, const QColor &color, qreal amount)
+{
+	if (amount <= 0.0)
+	{
+		return base;
+	}
+	if (amount >= 1.0)
+	{
+		return color;
+	}
+	if (qIsNaN(amount))
+	{
+		return base;
+	}
+
+	qreal baseLuma = luma(base); // cache value because luma call is expensive
+	double ri = contrastRatioForLuma(baseLuma, luma(color));
+	double rg = 1.0 + ((ri + 1.0) * amount * amount * amount);
+	double u = 1.0, l = 0.0;
+	QColor result;
+	for (int i = 12; i; --i)
+	{
+		double a = 0.5 * (l + u);
+		result = tintHelper(base, baseLuma, color, a);
+		double ra = contrastRatioForLuma(baseLuma, luma(result));
+		if (ra > rg)
+		{
+			u = a;
+		}
+		else
+		{
+			l = a;
+		}
+	}
+	return result;
+}
+
+QColor Rainbow::mix(const QColor &c1, const QColor &c2, qreal bias)
+{
+	if (bias <= 0.0)
+	{
+		return c1;
+	}
+	if (bias >= 1.0)
+	{
+		return c2;
+	}
+	if (qIsNaN(bias))
+	{
+		return c1;
+	}
+
+	qreal r = mixQreal(c1.redF(), c2.redF(), bias);
+	qreal g = mixQreal(c1.greenF(), c2.greenF(), bias);
+	qreal b = mixQreal(c1.blueF(), c2.blueF(), bias);
+	qreal a = mixQreal(c1.alphaF(), c2.alphaF(), bias);
+
+	return QColor::fromRgbF(r, g, b, a);
+}
+
+QColor Rainbow::overlayColors(const QColor &base, const QColor &paint,
+							  QPainter::CompositionMode comp)
+{
+	// This isn't the fastest way, but should be "fast enough".
+	// It's also the only safe way to use QPainter::CompositionMode
+	QImage img(1, 1, QImage::Format_ARGB32_Premultiplied);
+	QPainter p(&img);
+	QColor start = base;
+	start.setAlpha(255); // opaque
+	p.fillRect(0, 0, 1, 1, start);
+	p.setCompositionMode(comp);
+	p.fillRect(0, 0, 1, 1, paint);
+	p.end();
+	return img.pixel(0, 0);
+}
diff --git a/libraries/xz-embedded/CMakeLists.txt b/libraries/xz-embedded/CMakeLists.txt
new file mode 100644
index 00000000..5f744671
--- /dev/null
+++ b/libraries/xz-embedded/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.1)
+project(xz-embedded LANGUAGES C)
+
+option(XZ_BUILD_BCJ "Build xz-embedded with BCJ support (native binary optimization)" OFF)
+option(XZ_BUILD_CRC64 "Build xz-embedded with CRC64 checksum support" ON)
+option(XZ_BUILD_MINIDEC "Build a tiny utility that decompresses xz streams" OFF)
+
+# See include/xz.h for manual feature configuration
+# tweak this list and xz.h to fit your needs
+
+set(XZ_SOURCES
+	src/xz_crc32.c
+	src/xz_crc64.c
+	src/xz_dec_lzma2.c
+	src/xz_dec_stream.c
+#	src/xz_dec_bcj.c
+)
+add_library(xz-embedded STATIC ${XZ_SOURCES})
+target_include_directories(xz-embedded PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+set_property(TARGET xz-embedded PROPERTY C_STANDARD 99)
+
+if(${XZ_BUILD_MINIDEC})
+	add_executable(xzminidec xzminidec.c)
+	target_link_libraries(xzminidec xz-embedded)
+	set_property(TARGET xzminidec PROPERTY C_STANDARD 99)
+endif()
diff --git a/libraries/xz-embedded/include/xz.h b/libraries/xz-embedded/include/xz.h
new file mode 100644
index 00000000..eef8ef69
--- /dev/null
+++ b/libraries/xz-embedded/include/xz.h
@@ -0,0 +1,321 @@
+/*
+ * XZ decompressor
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#ifndef XZ_H
+#define XZ_H
+
+#ifdef __KERNEL__
+#include <linux/stddef.h>
+#include <linux/types.h>
+#else
+#include <stddef.h>
+#include <stdint.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Definitions that determine available features */
+#define XZ_DEC_ANY_CHECK 1
+#define XZ_USE_CRC64 1
+
+// native machine code compression stuff
+/*
+#define XZ_DEC_X86
+#define XZ_DEC_POWERPC
+#define XZ_DEC_IA64
+#define XZ_DEC_ARM
+#define XZ_DEC_ARMTHUMB
+#define XZ_DEC_SPARC
+*/
+
+/* In Linux, this is used to make extern functions static when needed. */
+#ifndef XZ_EXTERN
+#define XZ_EXTERN extern
+#endif
+
+/**
+ * enum xz_mode - Operation mode
+ *
+ * @XZ_SINGLE:              Single-call mode. This uses less RAM than
+ *                          than multi-call modes, because the LZMA2
+ *                          dictionary doesn't need to be allocated as
+ *                          part of the decoder state. All required data
+ *                          structures are allocated at initialization,
+ *                          so xz_dec_run() cannot return XZ_MEM_ERROR.
+ * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2
+ *                          dictionary buffer. All data structures are
+ *                          allocated at initialization, so xz_dec_run()
+ *                          cannot return XZ_MEM_ERROR.
+ * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is
+ *                          allocated once the required size has been
+ *                          parsed from the stream headers. If the
+ *                          allocation fails, xz_dec_run() will return
+ *                          XZ_MEM_ERROR.
+ *
+ * It is possible to enable support only for a subset of the above
+ * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
+ * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled
+ * with support for all operation modes, but the preboot code may
+ * be built with fewer features to minimize code size.
+ */
+enum xz_mode
+{
+	XZ_SINGLE,
+	XZ_PREALLOC,
+	XZ_DYNALLOC
+};
+
+/**
+ * enum xz_ret - Return codes
+ * @XZ_OK:                  Everything is OK so far. More input or more
+ *                          output space is required to continue. This
+ *                          return code is possible only in multi-call mode
+ *                          (XZ_PREALLOC or XZ_DYNALLOC).
+ * @XZ_STREAM_END:          Operation finished successfully.
+ * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
+ *                          is still possible in multi-call mode by simply
+ *                          calling xz_dec_run() again.
+ *                          Note that this return value is used only if
+ *                          XZ_DEC_ANY_CHECK was defined at build time,
+ *                          which is not used in the kernel. Unsupported
+ *                          check types return XZ_OPTIONS_ERROR if
+ *                          XZ_DEC_ANY_CHECK was not defined at build time.
+ * @XZ_MEM_ERROR:           Allocating memory failed. This return code is
+ *                          possible only if the decoder was initialized
+ *                          with XZ_DYNALLOC. The amount of memory that was
+ *                          tried to be allocated was no more than the
+ *                          dict_max argument given to xz_dec_init().
+ * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than
+ *                          allowed by the dict_max argument given to
+ *                          xz_dec_init(). This return value is possible
+ *                          only in multi-call mode (XZ_PREALLOC or
+ *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
+ *                          ignores the dict_max argument.
+ * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic
+ *                          bytes).
+ * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested
+ *                          compression options. In the decoder this means
+ *                          that the header CRC32 matches, but the header
+ *                          itself specifies something that we don't support.
+ * @XZ_DATA_ERROR:          Compressed data is corrupt.
+ * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly
+ *                          different between multi-call and single-call
+ *                          mode; more information below.
+ *
+ * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
+ * to XZ code cannot consume any input and cannot produce any new output.
+ * This happens when there is no new input available, or the output buffer
+ * is full while at least one output byte is still pending. Assuming your
+ * code is not buggy, you can get this error only when decoding a compressed
+ * stream that is truncated or otherwise corrupt.
+ *
+ * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
+ * is too small or the compressed input is corrupt in a way that makes the
+ * decoder produce more output than the caller expected. When it is
+ * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
+ * is used instead of XZ_BUF_ERROR.
+ */
+enum xz_ret
+{
+	XZ_OK,
+	XZ_STREAM_END,
+	XZ_UNSUPPORTED_CHECK,
+	XZ_MEM_ERROR,
+	XZ_MEMLIMIT_ERROR,
+	XZ_FORMAT_ERROR,
+	XZ_OPTIONS_ERROR,
+	XZ_DATA_ERROR,
+	XZ_BUF_ERROR
+};
+
+/**
+ * struct xz_buf - Passing input and output buffers to XZ code
+ * @in:         Beginning of the input buffer. This may be NULL if and only
+ *              if in_pos is equal to in_size.
+ * @in_pos:     Current position in the input buffer. This must not exceed
+ *              in_size.
+ * @in_size:    Size of the input buffer
+ * @out:        Beginning of the output buffer. This may be NULL if and only
+ *              if out_pos is equal to out_size.
+ * @out_pos:    Current position in the output buffer. This must not exceed
+ *              out_size.
+ * @out_size:   Size of the output buffer
+ *
+ * Only the contents of the output buffer from out[out_pos] onward, and
+ * the variables in_pos and out_pos are modified by the XZ code.
+ */
+struct xz_buf
+{
+	const uint8_t *in;
+	size_t in_pos;
+	size_t in_size;
+
+	uint8_t *out;
+	size_t out_pos;
+	size_t out_size;
+};
+
+/**
+ * struct xz_dec - Opaque type to hold the XZ decoder state
+ */
+struct xz_dec;
+
+/**
+ * xz_dec_init() - Allocate and initialize a XZ decoder state
+ * @mode:       Operation mode
+ * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
+ *              multi-call decoding. This is ignored in single-call mode
+ *              (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
+ *              or 2^n + 2^(n-1) bytes (the latter sizes are less common
+ *              in practice), so other values for dict_max don't make sense.
+ *              In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
+ *              512 KiB, and 1 MiB are probably the only reasonable values,
+ *              except for kernel and initramfs images where a bigger
+ *              dictionary can be fine and useful.
+ *
+ * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
+ * once. The caller must provide enough output space or the decoding will
+ * fail. The output space is used as the dictionary buffer, which is why
+ * there is no need to allocate the dictionary as part of the decoder's
+ * internal state.
+ *
+ * Because the output buffer is used as the workspace, streams encoded using
+ * a big dictionary are not a problem in single-call mode. It is enough that
+ * the output buffer is big enough to hold the actual uncompressed data; it
+ * can be smaller than the dictionary size stored in the stream headers.
+ *
+ * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
+ * of memory is preallocated for the LZMA2 dictionary. This way there is no
+ * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
+ * never allocate any memory. Instead, if the preallocated dictionary is too
+ * small for decoding the given input stream, xz_dec_run() will return
+ * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
+ * decoded to avoid allocating excessive amount of memory for the dictionary.
+ *
+ * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
+ * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
+ * may allocate once it has parsed the dictionary size from the stream
+ * headers. This way excessive allocations can be avoided while still
+ * limiting the maximum memory usage to a sane value to prevent running the
+ * system out of memory when decompressing streams from untrusted sources.
+ *
+ * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
+ * ready to be used with xz_dec_run(). If memory allocation fails,
+ * xz_dec_init() returns NULL.
+ */
+XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max);
+
+/**
+ * xz_dec_run() - Run the XZ decoder
+ * @s:          Decoder state allocated using xz_dec_init()
+ * @b:          Input and output buffers
+ *
+ * The possible return values depend on build options and operation mode.
+ * See enum xz_ret for details.
+ *
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
+ * contents of the output buffer from b->out[b->out_pos] onward are
+ * undefined. This is true even after XZ_BUF_ERROR, because with some filter
+ * chains, there may be a second pass over the output buffer, and this pass
+ * cannot be properly done if the output buffer is truncated. Thus, you
+ * cannot give the single-call decoder a too small buffer and then expect to
+ * get that amount valid data from the beginning of the stream. You must use
+ * the multi-call decoder if you don't want to uncompress the whole stream.
+ */
+XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b);
+
+/**
+ * xz_dec_reset() - Reset an already allocated decoder state
+ * @s:          Decoder state allocated using xz_dec_init()
+ *
+ * This function can be used to reset the multi-call decoder state without
+ * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
+ *
+ * In single-call mode, xz_dec_reset() is always called in the beginning of
+ * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
+ * multi-call mode.
+ */
+XZ_EXTERN void xz_dec_reset(struct xz_dec *s);
+
+/**
+ * xz_dec_end() - Free the memory allocated for the decoder state
+ * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
+ *              this function does nothing.
+ */
+XZ_EXTERN void xz_dec_end(struct xz_dec *s);
+
+/*
+ * Standalone build (userspace build or in-kernel build for boot time use)
+ * needs a CRC32 implementation. For normal in-kernel use, kernel's own
+ * CRC32 module is used instead, and users of this module don't need to
+ * care about the functions below.
+ */
+#ifndef XZ_INTERNAL_CRC32
+#ifdef __KERNEL__
+#define XZ_INTERNAL_CRC32 0
+#else
+#define XZ_INTERNAL_CRC32 1
+#endif
+#endif
+
+/*
+ * If CRC64 support has been enabled with XZ_USE_CRC64, a CRC64
+ * implementation is needed too.
+ */
+#ifndef XZ_USE_CRC64
+#undef XZ_INTERNAL_CRC64
+#define XZ_INTERNAL_CRC64 0
+#endif
+#ifndef XZ_INTERNAL_CRC64
+#ifdef __KERNEL__
+#error Using CRC64 in the kernel has not been implemented.
+#else
+#define XZ_INTERNAL_CRC64 1
+#endif
+#endif
+
+#if XZ_INTERNAL_CRC32
+/*
+ * This must be called before any other xz_* function to initialize
+ * the CRC32 lookup table.
+ */
+XZ_EXTERN void xz_crc32_init(void);
+
+/*
+ * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
+ * calculation, the third argument must be zero. To continue the calculation,
+ * the previously returned value is passed as the third argument.
+ */
+XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
+#endif
+
+#if XZ_INTERNAL_CRC64
+/*
+ * This must be called before any other xz_* function (except xz_crc32_init())
+ * to initialize the CRC64 lookup table.
+ */
+XZ_EXTERN void xz_crc64_init(void);
+
+/*
+ * Update CRC64 value using the polynomial from ECMA-182. To start a new
+ * calculation, the third argument must be zero. To continue the calculation,
+ * the previously returned value is passed as the third argument.
+ */
+XZ_EXTERN uint64_t xz_crc64(const uint8_t *buf, size_t size, uint64_t crc);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/libraries/xz-embedded/src/xz_config.h b/libraries/xz-embedded/src/xz_config.h
new file mode 100644
index 00000000..40805b75
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_config.h
@@ -0,0 +1,119 @@
+/*
+ * Private includes and definitions for userspace use of XZ Embedded
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#ifndef XZ_CONFIG_H
+#define XZ_CONFIG_H
+
+/* Uncomment to enable CRC64 support. */
+/* #define XZ_USE_CRC64 */
+
+/* Uncomment as needed to enable BCJ filter decoders. */
+/* #define XZ_DEC_X86 */
+/* #define XZ_DEC_POWERPC */
+/* #define XZ_DEC_IA64 */
+/* #define XZ_DEC_ARM */
+/* #define XZ_DEC_ARMTHUMB */
+/* #define XZ_DEC_SPARC */
+
+/*
+ * MSVC doesn't support modern C but XZ Embedded is mostly C89
+ * so these are enough.
+ */
+#ifdef _MSC_VER
+typedef unsigned char bool;
+#define true 1
+#define false 0
+#define inline __inline
+#else
+#include <stdbool.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "xz.h"
+
+#define kmalloc(size, flags) malloc(size)
+#define kfree(ptr) free(ptr)
+#define vmalloc(size) malloc(size)
+#define vfree(ptr) free(ptr)
+
+#define memeq(a, b, size) (memcmp(a, b, size) == 0)
+#define memzero(buf, size) memset(buf, 0, size)
+
+#ifndef min
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#endif
+#define min_t(type, x, y) min(x, y)
+
+/*
+ * Some functions have been marked with __always_inline to keep the
+ * performance reasonable even when the compiler is optimizing for
+ * small code size. You may be able to save a few bytes by #defining
+ * __always_inline to plain inline, but don't complain if the code
+ * becomes slow.
+ *
+ * NOTE: System headers on GNU/Linux may #define this macro already,
+ * so if you want to change it, you need to #undef it first.
+ */
+#ifndef __always_inline
+#ifdef __GNUC__
+#define __always_inline inline __attribute__((__always_inline__))
+#else
+#define __always_inline inline
+#endif
+#endif
+
+/* Inline functions to access unaligned unsigned 32-bit integers */
+#ifndef get_unaligned_le32
+static inline uint32_t get_unaligned_le32(const uint8_t *buf)
+{
+	return (uint32_t)buf[0] | ((uint32_t)buf[1] << 8) | ((uint32_t)buf[2] << 16) |
+		   ((uint32_t)buf[3] << 24);
+}
+#endif
+
+#ifndef get_unaligned_be32
+static inline uint32_t get_unaligned_be32(const uint8_t *buf)
+{
+	return (uint32_t)(buf[0] << 24) | ((uint32_t)buf[1] << 16) | ((uint32_t)buf[2] << 8) |
+		   (uint32_t)buf[3];
+}
+#endif
+
+#ifndef put_unaligned_le32
+static inline void put_unaligned_le32(uint32_t val, uint8_t *buf)
+{
+	buf[0] = (uint8_t)val;
+	buf[1] = (uint8_t)(val >> 8);
+	buf[2] = (uint8_t)(val >> 16);
+	buf[3] = (uint8_t)(val >> 24);
+}
+#endif
+
+#ifndef put_unaligned_be32
+static inline void put_unaligned_be32(uint32_t val, uint8_t *buf)
+{
+	buf[0] = (uint8_t)(val >> 24);
+	buf[1] = (uint8_t)(val >> 16);
+	buf[2] = (uint8_t)(val >> 8);
+	buf[3] = (uint8_t)val;
+}
+#endif
+
+/*
+ * Use get_unaligned_le32() also for aligned access for simplicity. On
+ * little endian systems, #define get_le32(ptr) (*(const uint32_t *)(ptr))
+ * could save a few bytes in code size.
+ */
+#ifndef get_le32
+#define get_le32 get_unaligned_le32
+#endif
+
+#endif
diff --git a/libraries/xz-embedded/src/xz_crc32.c b/libraries/xz-embedded/src/xz_crc32.c
new file mode 100644
index 00000000..c412662b
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_crc32.c
@@ -0,0 +1,61 @@
+/*
+ * CRC32 using the polynomial from IEEE-802.3
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+/*
+ * This is not the fastest implementation, but it is pretty compact.
+ * The fastest versions of xz_crc32() on modern CPUs without hardware
+ * accelerated CRC instruction are 3-5 times as fast as this version,
+ * but they are bigger and use more memory for the lookup table.
+ */
+
+#include "xz_private.h"
+
+/*
+ * STATIC_RW_DATA is used in the pre-boot environment on some architectures.
+ * See <linux/decompress/mm.h> for details.
+ */
+#ifndef STATIC_RW_DATA
+#define STATIC_RW_DATA static
+#endif
+
+STATIC_RW_DATA uint32_t xz_crc32_table[256];
+
+XZ_EXTERN void xz_crc32_init(void)
+{
+	const uint32_t poly = 0xEDB88320;
+
+	uint32_t i;
+	uint32_t j;
+	uint32_t r;
+
+	for (i = 0; i < 256; ++i)
+	{
+		r = i;
+		for (j = 0; j < 8; ++j)
+			r = (r >> 1) ^ (poly & ~((r & 1) - 1));
+
+		xz_crc32_table[i] = r;
+	}
+
+	return;
+}
+
+XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
+{
+	crc = ~crc;
+
+	while (size != 0)
+	{
+		crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
+		--size;
+	}
+
+	return ~crc;
+}
diff --git a/libraries/xz-embedded/src/xz_crc64.c b/libraries/xz-embedded/src/xz_crc64.c
new file mode 100644
index 00000000..4794b9d3
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_crc64.c
@@ -0,0 +1,52 @@
+/*
+ * CRC64 using the polynomial from ECMA-182
+ *
+ * This file is similar to xz_crc32.c. See the comments there.
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#include "xz_private.h"
+
+#ifndef STATIC_RW_DATA
+#define STATIC_RW_DATA static
+#endif
+
+STATIC_RW_DATA uint64_t xz_crc64_table[256];
+
+XZ_EXTERN void xz_crc64_init(void)
+{
+	const uint64_t poly = 0xC96C5795D7870F42;
+
+	uint32_t i;
+	uint32_t j;
+	uint64_t r;
+
+	for (i = 0; i < 256; ++i)
+	{
+		r = i;
+		for (j = 0; j < 8; ++j)
+			r = (r >> 1) ^ (poly & ~((r & 1) - 1));
+
+		xz_crc64_table[i] = r;
+	}
+
+	return;
+}
+
+XZ_EXTERN uint64_t xz_crc64(const uint8_t *buf, size_t size, uint64_t crc)
+{
+	crc = ~crc;
+
+	while (size != 0)
+	{
+		crc = xz_crc64_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
+		--size;
+	}
+
+	return ~crc;
+}
diff --git a/libraries/xz-embedded/src/xz_dec_bcj.c b/libraries/xz-embedded/src/xz_dec_bcj.c
new file mode 100644
index 00000000..9ffda3bd
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_dec_bcj.c
@@ -0,0 +1,588 @@
+/*
+ * Branch/Call/Jump (BCJ) filter decoders
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#include "xz_private.h"
+
+/*
+ * The rest of the file is inside this ifdef. It makes things a little more
+ * convenient when building without support for any BCJ filters.
+ */
+#ifdef XZ_DEC_BCJ
+
+struct xz_dec_bcj
+{
+	/* Type of the BCJ filter being used */
+	enum
+	{
+		BCJ_X86 = 4,	  /* x86 or x86-64 */
+		BCJ_POWERPC = 5,  /* Big endian only */
+		BCJ_IA64 = 6,	 /* Big or little endian */
+		BCJ_ARM = 7,	  /* Little endian only */
+		BCJ_ARMTHUMB = 8, /* Little endian only */
+		BCJ_SPARC = 9	 /* Big or little endian */
+	} type;
+
+	/*
+	 * Return value of the next filter in the chain. We need to preserve
+	 * this information across calls, because we must not call the next
+	 * filter anymore once it has returned XZ_STREAM_END.
+	 */
+	enum xz_ret ret;
+
+	/* True if we are operating in single-call mode. */
+	bool single_call;
+
+	/*
+	 * Absolute position relative to the beginning of the uncompressed
+	 * data (in a single .xz Block). We care only about the lowest 32
+	 * bits so this doesn't need to be uint64_t even with big files.
+	 */
+	uint32_t pos;
+
+	/* x86 filter state */
+	uint32_t x86_prev_mask;
+
+	/* Temporary space to hold the variables from struct xz_buf */
+	uint8_t *out;
+	size_t out_pos;
+	size_t out_size;
+
+	struct
+	{
+		/* Amount of already filtered data in the beginning of buf */
+		size_t filtered;
+
+		/* Total amount of data currently stored in buf  */
+		size_t size;
+
+		/*
+		 * Buffer to hold a mix of filtered and unfiltered data. This
+		 * needs to be big enough to hold Alignment + 2 * Look-ahead:
+		 *
+		 * Type         Alignment   Look-ahead
+		 * x86              1           4
+		 * PowerPC          4           0
+		 * IA-64           16           0
+		 * ARM              4           0
+		 * ARM-Thumb        2           2
+		 * SPARC            4           0
+		 */
+		uint8_t buf[16];
+	} temp;
+};
+
+#ifdef XZ_DEC_X86
+/*
+ * This is used to test the most significant byte of a memory address
+ * in an x86 instruction.
+ */
+static inline int bcj_x86_test_msbyte(uint8_t b)
+{
+	return b == 0x00 || b == 0xFF;
+}
+
+static size_t bcj_x86(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	static const bool mask_to_allowed_status[8] = {true, true,  true,  false,
+												   true, false, false, false};
+
+	static const uint8_t mask_to_bit_num[8] = {0, 1, 2, 2, 3, 3, 3, 3};
+
+	size_t i;
+	size_t prev_pos = (size_t) - 1;
+	uint32_t prev_mask = s->x86_prev_mask;
+	uint32_t src;
+	uint32_t dest;
+	uint32_t j;
+	uint8_t b;
+
+	if (size <= 4)
+		return 0;
+
+	size -= 4;
+	for (i = 0; i < size; ++i)
+	{
+		if ((buf[i] & 0xFE) != 0xE8)
+			continue;
+
+		prev_pos = i - prev_pos;
+		if (prev_pos > 3)
+		{
+			prev_mask = 0;
+		}
+		else
+		{
+			prev_mask = (prev_mask << (prev_pos - 1)) & 7;
+			if (prev_mask != 0)
+			{
+				b = buf[i + 4 - mask_to_bit_num[prev_mask]];
+				if (!mask_to_allowed_status[prev_mask] || bcj_x86_test_msbyte(b))
+				{
+					prev_pos = i;
+					prev_mask = (prev_mask << 1) | 1;
+					continue;
+				}
+			}
+		}
+
+		prev_pos = i;
+
+		if (bcj_x86_test_msbyte(buf[i + 4]))
+		{
+			src = get_unaligned_le32(buf + i + 1);
+			while (true)
+			{
+				dest = src - (s->pos + (uint32_t)i + 5);
+				if (prev_mask == 0)
+					break;
+
+				j = mask_to_bit_num[prev_mask] * 8;
+				b = (uint8_t)(dest >> (24 - j));
+				if (!bcj_x86_test_msbyte(b))
+					break;
+
+				src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
+			}
+
+			dest &= 0x01FFFFFF;
+			dest |= (uint32_t)0 - (dest & 0x01000000);
+			put_unaligned_le32(dest, buf + i + 1);
+			i += 4;
+		}
+		else
+		{
+			prev_mask = (prev_mask << 1) | 1;
+		}
+	}
+
+	prev_pos = i - prev_pos;
+	s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_POWERPC
+static size_t bcj_powerpc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t instr;
+
+	for (i = 0; i + 4 <= size; i += 4)
+	{
+		instr = get_unaligned_be32(buf + i);
+		if ((instr & 0xFC000003) == 0x48000001)
+		{
+			instr &= 0x03FFFFFC;
+			instr -= s->pos + (uint32_t)i;
+			instr &= 0x03FFFFFC;
+			instr |= 0x48000001;
+			put_unaligned_be32(instr, buf + i);
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_IA64
+static size_t bcj_ia64(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	static const uint8_t branch_table[32] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+											 4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0};
+
+	/*
+	 * The local variables take a little bit stack space, but it's less
+	 * than what LZMA2 decoder takes, so it doesn't make sense to reduce
+	 * stack usage here without doing that for the LZMA2 decoder too.
+	 */
+
+	/* Loop counters */
+	size_t i;
+	size_t j;
+
+	/* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
+	uint32_t slot;
+
+	/* Bitwise offset of the instruction indicated by slot */
+	uint32_t bit_pos;
+
+	/* bit_pos split into byte and bit parts */
+	uint32_t byte_pos;
+	uint32_t bit_res;
+
+	/* Address part of an instruction */
+	uint32_t addr;
+
+	/* Mask used to detect which instructions to convert */
+	uint32_t mask;
+
+	/* 41-bit instruction stored somewhere in the lowest 48 bits */
+	uint64_t instr;
+
+	/* Instruction normalized with bit_res for easier manipulation */
+	uint64_t norm;
+
+	for (i = 0; i + 16 <= size; i += 16)
+	{
+		mask = branch_table[buf[i] & 0x1F];
+		for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41)
+		{
+			if (((mask >> slot) & 1) == 0)
+				continue;
+
+			byte_pos = bit_pos >> 3;
+			bit_res = bit_pos & 7;
+			instr = 0;
+			for (j = 0; j < 6; ++j)
+				instr |= (uint64_t)(buf[i + j + byte_pos]) << (8 * j);
+
+			norm = instr >> bit_res;
+
+			if (((norm >> 37) & 0x0F) == 0x05 && ((norm >> 9) & 0x07) == 0)
+			{
+				addr = (norm >> 13) & 0x0FFFFF;
+				addr |= ((uint32_t)(norm >> 36) & 1) << 20;
+				addr <<= 4;
+				addr -= s->pos + (uint32_t)i;
+				addr >>= 4;
+
+				norm &= ~((uint64_t)0x8FFFFF << 13);
+				norm |= (uint64_t)(addr & 0x0FFFFF) << 13;
+				norm |= (uint64_t)(addr & 0x100000) << (36 - 20);
+
+				instr &= (1 << bit_res) - 1;
+				instr |= norm << bit_res;
+
+				for (j = 0; j < 6; j++)
+					buf[i + j + byte_pos] = (uint8_t)(instr >> (8 * j));
+			}
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_ARM
+static size_t bcj_arm(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t addr;
+
+	for (i = 0; i + 4 <= size; i += 4)
+	{
+		if (buf[i + 3] == 0xEB)
+		{
+			addr =
+				(uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8) | ((uint32_t)buf[i + 2] << 16);
+			addr <<= 2;
+			addr -= s->pos + (uint32_t)i + 8;
+			addr >>= 2;
+			buf[i] = (uint8_t)addr;
+			buf[i + 1] = (uint8_t)(addr >> 8);
+			buf[i + 2] = (uint8_t)(addr >> 16);
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_ARMTHUMB
+static size_t bcj_armthumb(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t addr;
+
+	for (i = 0; i + 4 <= size; i += 2)
+	{
+		if ((buf[i + 1] & 0xF8) == 0xF0 && (buf[i + 3] & 0xF8) == 0xF8)
+		{
+			addr = (((uint32_t)buf[i + 1] & 0x07) << 19) | ((uint32_t)buf[i] << 11) |
+				   (((uint32_t)buf[i + 3] & 0x07) << 8) | (uint32_t)buf[i + 2];
+			addr <<= 1;
+			addr -= s->pos + (uint32_t)i + 4;
+			addr >>= 1;
+			buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));
+			buf[i] = (uint8_t)(addr >> 11);
+			buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));
+			buf[i + 2] = (uint8_t)addr;
+			i += 2;
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_SPARC
+static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t instr;
+
+	for (i = 0; i + 4 <= size; i += 4)
+	{
+		instr = get_unaligned_be32(buf + i);
+		if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF)
+		{
+			instr <<= 2;
+			instr -= s->pos + (uint32_t)i;
+			instr >>= 2;
+			instr =
+				((uint32_t)0x40000000 - (instr & 0x400000)) | 0x40000000 | (instr & 0x3FFFFF);
+			put_unaligned_be32(instr, buf + i);
+		}
+	}
+
+	return i;
+}
+#endif
+
+/*
+ * Apply the selected BCJ filter. Update *pos and s->pos to match the amount
+ * of data that got filtered.
+ *
+ * NOTE: This is implemented as a switch statement to avoid using function
+ * pointers, which could be problematic in the kernel boot code, which must
+ * avoid pointers to static data (at least on x86).
+ */
+static void bcj_apply(struct xz_dec_bcj *s, uint8_t *buf, size_t *pos, size_t size)
+{
+	size_t filtered;
+
+	buf += *pos;
+	size -= *pos;
+
+	switch (s->type)
+	{
+#ifdef XZ_DEC_X86
+	case BCJ_X86:
+		filtered = bcj_x86(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_POWERPC
+	case BCJ_POWERPC:
+		filtered = bcj_powerpc(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_IA64
+	case BCJ_IA64:
+		filtered = bcj_ia64(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_ARM
+	case BCJ_ARM:
+		filtered = bcj_arm(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_ARMTHUMB
+	case BCJ_ARMTHUMB:
+		filtered = bcj_armthumb(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_SPARC
+	case BCJ_SPARC:
+		filtered = bcj_sparc(s, buf, size);
+		break;
+#endif
+	default:
+		/* Never reached but silence compiler warnings. */
+		filtered = 0;
+		break;
+	}
+
+	*pos += filtered;
+	s->pos += filtered;
+}
+
+/*
+ * Flush pending filtered data from temp to the output buffer.
+ * Move the remaining mixture of possibly filtered and unfiltered
+ * data to the beginning of temp.
+ */
+static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)
+{
+	size_t copy_size;
+
+	copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
+	memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
+	b->out_pos += copy_size;
+
+	s->temp.filtered -= copy_size;
+	s->temp.size -= copy_size;
+	memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
+}
+
+/*
+ * The BCJ filter functions are primitive in sense that they process the
+ * data in chunks of 1-16 bytes. To hide this issue, this function does
+ * some buffering.
+ */
+XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s, struct xz_dec_lzma2 *lzma2,
+									 struct xz_buf *b)
+{
+	size_t out_start;
+
+	/*
+	 * Flush pending already filtered data to the output buffer. Return
+	 * immediatelly if we couldn't flush everything, or if the next
+	 * filter in the chain had already returned XZ_STREAM_END.
+	 */
+	if (s->temp.filtered > 0)
+	{
+		bcj_flush(s, b);
+		if (s->temp.filtered > 0)
+			return XZ_OK;
+
+		if (s->ret == XZ_STREAM_END)
+			return XZ_STREAM_END;
+	}
+
+	/*
+	 * If we have more output space than what is currently pending in
+	 * temp, copy the unfiltered data from temp to the output buffer
+	 * and try to fill the output buffer by decoding more data from the
+	 * next filter in the chain. Apply the BCJ filter on the new data
+	 * in the output buffer. If everything cannot be filtered, copy it
+	 * to temp and rewind the output buffer position accordingly.
+	 *
+	 * This needs to be always run when temp.size == 0 to handle a special
+	 * case where the output buffer is full and the next filter has no
+	 * more output coming but hasn't returned XZ_STREAM_END yet.
+	 */
+	if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0)
+	{
+		out_start = b->out_pos;
+		memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
+		b->out_pos += s->temp.size;
+
+		s->ret = xz_dec_lzma2_run(lzma2, b);
+		if (s->ret != XZ_STREAM_END && (s->ret != XZ_OK || s->single_call))
+			return s->ret;
+
+		bcj_apply(s, b->out, &out_start, b->out_pos);
+
+		/*
+		 * As an exception, if the next filter returned XZ_STREAM_END,
+		 * we can do that too, since the last few bytes that remain
+		 * unfiltered are meant to remain unfiltered.
+		 */
+		if (s->ret == XZ_STREAM_END)
+			return XZ_STREAM_END;
+
+		s->temp.size = b->out_pos - out_start;
+		b->out_pos -= s->temp.size;
+		memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+
+		/*
+		 * If there wasn't enough input to the next filter to fill
+		 * the output buffer with unfiltered data, there's no point
+		 * to try decoding more data to temp.
+		 */
+		if (b->out_pos + s->temp.size < b->out_size)
+			return XZ_OK;
+	}
+
+	/*
+	 * We have unfiltered data in temp. If the output buffer isn't full
+	 * yet, try to fill the temp buffer by decoding more data from the
+	 * next filter. Apply the BCJ filter on temp. Then we hopefully can
+	 * fill the actual output buffer by copying filtered data from temp.
+	 * A mix of filtered and unfiltered data may be left in temp; it will
+	 * be taken care on the next call to this function.
+	 */
+	if (b->out_pos < b->out_size)
+	{
+		/* Make b->out{,_pos,_size} temporarily point to s->temp. */
+		s->out = b->out;
+		s->out_pos = b->out_pos;
+		s->out_size = b->out_size;
+		b->out = s->temp.buf;
+		b->out_pos = s->temp.size;
+		b->out_size = sizeof(s->temp.buf);
+
+		s->ret = xz_dec_lzma2_run(lzma2, b);
+
+		s->temp.size = b->out_pos;
+		b->out = s->out;
+		b->out_pos = s->out_pos;
+		b->out_size = s->out_size;
+
+		if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
+			return s->ret;
+
+		bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
+
+		/*
+		 * If the next filter returned XZ_STREAM_END, we mark that
+		 * everything is filtered, since the last unfiltered bytes
+		 * of the stream are meant to be left as is.
+		 */
+		if (s->ret == XZ_STREAM_END)
+			s->temp.filtered = s->temp.size;
+
+		bcj_flush(s, b);
+		if (s->temp.filtered > 0)
+			return XZ_OK;
+	}
+
+	return s->ret;
+}
+
+XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call)
+{
+	struct xz_dec_bcj *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s != NULL)
+		s->single_call = single_call;
+
+	return s;
+}
+
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id)
+{
+	switch (id)
+	{
+#ifdef XZ_DEC_X86
+	case BCJ_X86:
+#endif
+#ifdef XZ_DEC_POWERPC
+	case BCJ_POWERPC:
+#endif
+#ifdef XZ_DEC_IA64
+	case BCJ_IA64:
+#endif
+#ifdef XZ_DEC_ARM
+	case BCJ_ARM:
+#endif
+#ifdef XZ_DEC_ARMTHUMB
+	case BCJ_ARMTHUMB:
+#endif
+#ifdef XZ_DEC_SPARC
+	case BCJ_SPARC:
+#endif
+		break;
+
+	default:
+		/* Unsupported Filter ID */
+		return XZ_OPTIONS_ERROR;
+	}
+
+	s->type = id;
+	s->ret = XZ_OK;
+	s->pos = 0;
+	s->x86_prev_mask = 0;
+	s->temp.filtered = 0;
+	s->temp.size = 0;
+
+	return XZ_OK;
+}
+
+#endif
diff --git a/libraries/xz-embedded/src/xz_dec_lzma2.c b/libraries/xz-embedded/src/xz_dec_lzma2.c
new file mode 100644
index 00000000..3d7b9a2e
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_dec_lzma2.c
@@ -0,0 +1,1231 @@
+/*
+ * LZMA2 decoder
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#include "xz_private.h"
+#include "xz_lzma2.h"
+
+/*
+ * Range decoder initialization eats the first five bytes of each LZMA chunk.
+ */
+#define RC_INIT_BYTES 5
+
+/*
+ * Minimum number of usable input buffer to safely decode one LZMA symbol.
+ * The worst case is that we decode 22 bits using probabilities and 26
+ * direct bits. This may decode at maximum of 20 bytes of input. However,
+ * lzma_main() does an extra normalization before returning, thus we
+ * need to put 21 here.
+ */
+#define LZMA_IN_REQUIRED 21
+
+/*
+ * Dictionary (history buffer)
+ *
+ * These are always true:
+ *    start <= pos <= full <= end
+ *    pos <= limit <= end
+ *
+ * In multi-call mode, also these are true:
+ *    end == size
+ *    size <= size_max
+ *    allocated <= size
+ *
+ * Most of these variables are size_t to support single-call mode,
+ * in which the dictionary variables address the actual output
+ * buffer directly.
+ */
+struct dictionary
+{
+	/* Beginning of the history buffer */
+	uint8_t *buf;
+
+	/* Old position in buf (before decoding more data) */
+	size_t start;
+
+	/* Position in buf */
+	size_t pos;
+
+	/*
+	 * How full dictionary is. This is used to detect corrupt input that
+	 * would read beyond the beginning of the uncompressed stream.
+	 */
+	size_t full;
+
+	/* Write limit; we don't write to buf[limit] or later bytes. */
+	size_t limit;
+
+	/*
+	 * End of the dictionary buffer. In multi-call mode, this is
+	 * the same as the dictionary size. In single-call mode, this
+	 * indicates the size of the output buffer.
+	 */
+	size_t end;
+
+	/*
+	 * Size of the dictionary as specified in Block Header. This is used
+	 * together with "full" to detect corrupt input that would make us
+	 * read beyond the beginning of the uncompressed stream.
+	 */
+	uint32_t size;
+
+	/*
+	 * Maximum allowed dictionary size in multi-call mode.
+	 * This is ignored in single-call mode.
+	 */
+	uint32_t size_max;
+
+	/*
+	 * Amount of memory currently allocated for the dictionary.
+	 * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,
+	 * size_max is always the same as the allocated size.)
+	 */
+	uint32_t allocated;
+
+	/* Operation mode */
+	enum xz_mode mode;
+};
+
+/* Range decoder */
+struct rc_dec
+{
+	uint32_t range;
+	uint32_t code;
+
+	/*
+	 * Number of initializing bytes remaining to be read
+	 * by rc_read_init().
+	 */
+	uint32_t init_bytes_left;
+
+	/*
+	 * Buffer from which we read our input. It can be either
+	 * temp.buf or the caller-provided input buffer.
+	 */
+	const uint8_t *in;
+	size_t in_pos;
+	size_t in_limit;
+};
+
+/* Probabilities for a length decoder. */
+struct lzma_len_dec
+{
+	/* Probability of match length being at least 10 */
+	uint16_t choice;
+
+	/* Probability of match length being at least 18 */
+	uint16_t choice2;
+
+	/* Probabilities for match lengths 2-9 */
+	uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
+
+	/* Probabilities for match lengths 10-17 */
+	uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
+
+	/* Probabilities for match lengths 18-273 */
+	uint16_t high[LEN_HIGH_SYMBOLS];
+};
+
+struct lzma_dec
+{
+	/* Distances of latest four matches */
+	uint32_t rep0;
+	uint32_t rep1;
+	uint32_t rep2;
+	uint32_t rep3;
+
+	/* Types of the most recently seen LZMA symbols */
+	enum lzma_state state;
+
+	/*
+	 * Length of a match. This is updated so that dict_repeat can
+	 * be called again to finish repeating the whole match.
+	 */
+	uint32_t len;
+
+	/*
+	 * LZMA properties or related bit masks (number of literal
+	 * context bits, a mask dervied from the number of literal
+	 * position bits, and a mask dervied from the number
+	 * position bits)
+	 */
+	uint32_t lc;
+	uint32_t literal_pos_mask; /* (1 << lp) - 1 */
+	uint32_t pos_mask;		 /* (1 << pb) - 1 */
+
+	/* If 1, it's a match. Otherwise it's a single 8-bit literal. */
+	uint16_t is_match[STATES][POS_STATES_MAX];
+
+	/* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
+	uint16_t is_rep[STATES];
+
+	/*
+	 * If 0, distance of a repeated match is rep0.
+	 * Otherwise check is_rep1.
+	 */
+	uint16_t is_rep0[STATES];
+
+	/*
+	 * If 0, distance of a repeated match is rep1.
+	 * Otherwise check is_rep2.
+	 */
+	uint16_t is_rep1[STATES];
+
+	/* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
+	uint16_t is_rep2[STATES];
+
+	/*
+	 * If 1, the repeated match has length of one byte. Otherwise
+	 * the length is decoded from rep_len_decoder.
+	 */
+	uint16_t is_rep0_long[STATES][POS_STATES_MAX];
+
+	/*
+	 * Probability tree for the highest two bits of the match
+	 * distance. There is a separate probability tree for match
+	 * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
+	 */
+	uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
+
+	/*
+	 * Probility trees for additional bits for match distance
+	 * when the distance is in the range [4, 127].
+	 */
+	uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
+
+	/*
+	 * Probability tree for the lowest four bits of a match
+	 * distance that is equal to or greater than 128.
+	 */
+	uint16_t dist_align[ALIGN_SIZE];
+
+	/* Length of a normal match */
+	struct lzma_len_dec match_len_dec;
+
+	/* Length of a repeated match */
+	struct lzma_len_dec rep_len_dec;
+
+	/* Probabilities of literals */
+	uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
+};
+
+struct lzma2_dec
+{
+	/* Position in xz_dec_lzma2_run(). */
+	enum lzma2_seq
+	{
+		SEQ_CONTROL,
+		SEQ_UNCOMPRESSED_1,
+		SEQ_UNCOMPRESSED_2,
+		SEQ_COMPRESSED_0,
+		SEQ_COMPRESSED_1,
+		SEQ_PROPERTIES,
+		SEQ_LZMA_PREPARE,
+		SEQ_LZMA_RUN,
+		SEQ_COPY
+	} sequence;
+
+	/* Next position after decoding the compressed size of the chunk. */
+	enum lzma2_seq next_sequence;
+
+	/* Uncompressed size of LZMA chunk (2 MiB at maximum) */
+	uint32_t uncompressed;
+
+	/*
+	 * Compressed size of LZMA chunk or compressed/uncompressed
+	 * size of uncompressed chunk (64 KiB at maximum)
+	 */
+	uint32_t compressed;
+
+	/*
+	 * True if dictionary reset is needed. This is false before
+	 * the first chunk (LZMA or uncompressed).
+	 */
+	bool need_dict_reset;
+
+	/*
+	 * True if new LZMA properties are needed. This is false
+	 * before the first LZMA chunk.
+	 */
+	bool need_props;
+};
+
+struct xz_dec_lzma2
+{
+	/*
+	 * The order below is important on x86 to reduce code size and
+	 * it shouldn't hurt on other platforms. Everything up to and
+	 * including lzma.pos_mask are in the first 128 bytes on x86-32,
+	 * which allows using smaller instructions to access those
+	 * variables. On x86-64, fewer variables fit into the first 128
+	 * bytes, but this is still the best order without sacrificing
+	 * the readability by splitting the structures.
+	 */
+	struct rc_dec rc;
+	struct dictionary dict;
+	struct lzma2_dec lzma2;
+	struct lzma_dec lzma;
+
+	/*
+	 * Temporary buffer which holds small number of input bytes between
+	 * decoder calls. See lzma2_lzma() for details.
+	 */
+	struct
+	{
+		uint32_t size;
+		uint8_t buf[3 * LZMA_IN_REQUIRED];
+	} temp;
+};
+
+/**************
+ * Dictionary *
+ **************/
+
+/*
+ * Reset the dictionary state. When in single-call mode, set up the beginning
+ * of the dictionary to point to the actual output buffer.
+ */
+static void dict_reset(struct dictionary *dict, struct xz_buf *b)
+{
+	if (DEC_IS_SINGLE(dict->mode))
+	{
+		dict->buf = b->out + b->out_pos;
+		dict->end = b->out_size - b->out_pos;
+	}
+
+	dict->start = 0;
+	dict->pos = 0;
+	dict->limit = 0;
+	dict->full = 0;
+}
+
+/* Set dictionary write limit */
+static void dict_limit(struct dictionary *dict, size_t out_max)
+{
+	if (dict->end - dict->pos <= out_max)
+		dict->limit = dict->end;
+	else
+		dict->limit = dict->pos + out_max;
+}
+
+/* Return true if at least one byte can be written into the dictionary. */
+static inline bool dict_has_space(const struct dictionary *dict)
+{
+	return dict->pos < dict->limit;
+}
+
+/*
+ * Get a byte from the dictionary at the given distance. The distance is
+ * assumed to valid, or as a special case, zero when the dictionary is
+ * still empty. This special case is needed for single-call decoding to
+ * avoid writing a '\0' to the end of the destination buffer.
+ */
+static inline uint32_t dict_get(const struct dictionary *dict, uint32_t dist)
+{
+	size_t offset = dict->pos - dist - 1;
+
+	if (dist >= dict->pos)
+		offset += dict->end;
+
+	return dict->full > 0 ? dict->buf[offset] : 0;
+}
+
+/*
+ * Put one byte into the dictionary. It is assumed that there is space for it.
+ */
+static inline void dict_put(struct dictionary *dict, uint8_t byte)
+{
+	dict->buf[dict->pos++] = byte;
+
+	if (dict->full < dict->pos)
+		dict->full = dict->pos;
+}
+
+/*
+ * Repeat given number of bytes from the given distance. If the distance is
+ * invalid, false is returned. On success, true is returned and *len is
+ * updated to indicate how many bytes were left to be repeated.
+ */
+static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)
+{
+	size_t back;
+	uint32_t left;
+
+	if (dist >= dict->full || dist >= dict->size)
+		return false;
+
+	left = min_t(size_t, dict->limit - dict->pos, *len);
+	*len -= left;
+
+	back = dict->pos - dist - 1;
+	if (dist >= dict->pos)
+		back += dict->end;
+
+	do
+	{
+		dict->buf[dict->pos++] = dict->buf[back++];
+		if (back == dict->end)
+			back = 0;
+	} while (--left > 0);
+
+	if (dict->full < dict->pos)
+		dict->full = dict->pos;
+
+	return true;
+}
+
+/* Copy uncompressed data as is from input to dictionary and output buffers. */
+static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b, uint32_t *left)
+{
+	size_t copy_size;
+
+	while (*left > 0 && b->in_pos < b->in_size && b->out_pos < b->out_size)
+	{
+		copy_size = min(b->in_size - b->in_pos, b->out_size - b->out_pos);
+		if (copy_size > dict->end - dict->pos)
+			copy_size = dict->end - dict->pos;
+		if (copy_size > *left)
+			copy_size = *left;
+
+		*left -= copy_size;
+
+		memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
+		dict->pos += copy_size;
+
+		if (dict->full < dict->pos)
+			dict->full = dict->pos;
+
+		if (DEC_IS_MULTI(dict->mode))
+		{
+			if (dict->pos == dict->end)
+				dict->pos = 0;
+
+			memcpy(b->out + b->out_pos, b->in + b->in_pos, copy_size);
+		}
+
+		dict->start = dict->pos;
+
+		b->out_pos += copy_size;
+		b->in_pos += copy_size;
+	}
+}
+
+/*
+ * Flush pending data from dictionary to b->out. It is assumed that there is
+ * enough space in b->out. This is guaranteed because caller uses dict_limit()
+ * before decoding data into the dictionary.
+ */
+static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b)
+{
+	size_t copy_size = dict->pos - dict->start;
+
+	if (DEC_IS_MULTI(dict->mode))
+	{
+		if (dict->pos == dict->end)
+			dict->pos = 0;
+
+		memcpy(b->out + b->out_pos, dict->buf + dict->start, copy_size);
+	}
+
+	dict->start = dict->pos;
+	b->out_pos += copy_size;
+	return copy_size;
+}
+
+/*****************
+ * Range decoder *
+ *****************/
+
+/* Reset the range decoder. */
+static void rc_reset(struct rc_dec *rc)
+{
+	rc->range = (uint32_t) - 1;
+	rc->code = 0;
+	rc->init_bytes_left = RC_INIT_BYTES;
+}
+
+/*
+ * Read the first five initial bytes into rc->code if they haven't been
+ * read already. (Yes, the first byte gets completely ignored.)
+ */
+static bool rc_read_init(struct rc_dec *rc, struct xz_buf *b)
+{
+	while (rc->init_bytes_left > 0)
+	{
+		if (b->in_pos == b->in_size)
+			return false;
+
+		rc->code = (rc->code << 8) + b->in[b->in_pos++];
+		--rc->init_bytes_left;
+	}
+
+	return true;
+}
+
+/* Return true if there may not be enough input for the next decoding loop. */
+static inline bool rc_limit_exceeded(const struct rc_dec *rc)
+{
+	return rc->in_pos > rc->in_limit;
+}
+
+/*
+ * Return true if it is possible (from point of view of range decoder) that
+ * we have reached the end of the LZMA chunk.
+ */
+static inline bool rc_is_finished(const struct rc_dec *rc)
+{
+	return rc->code == 0;
+}
+
+/* Read the next input byte if needed. */
+static __always_inline void rc_normalize(struct rc_dec *rc)
+{
+	if (rc->range < RC_TOP_VALUE)
+	{
+		rc->range <<= RC_SHIFT_BITS;
+		rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
+	}
+}
+
+/*
+ * Decode one bit. In some versions, this function has been splitted in three
+ * functions so that the compiler is supposed to be able to more easily avoid
+ * an extra branch. In this particular version of the LZMA decoder, this
+ * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3
+ * on x86). Using a non-splitted version results in nicer looking code too.
+ *
+ * NOTE: This must return an int. Do not make it return a bool or the speed
+ * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
+ * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)
+ */
+static __always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob)
+{
+	uint32_t bound;
+	int bit;
+
+	rc_normalize(rc);
+	bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
+	if (rc->code < bound)
+	{
+		rc->range = bound;
+		*prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;
+		bit = 0;
+	}
+	else
+	{
+		rc->range -= bound;
+		rc->code -= bound;
+		*prob -= *prob >> RC_MOVE_BITS;
+		bit = 1;
+	}
+
+	return bit;
+}
+
+/* Decode a bittree starting from the most significant bit. */
+static __always_inline uint32_t rc_bittree(struct rc_dec *rc, uint16_t *probs, uint32_t limit)
+{
+	uint32_t symbol = 1;
+
+	do
+	{
+		if (rc_bit(rc, &probs[symbol]))
+			symbol = (symbol << 1) + 1;
+		else
+			symbol <<= 1;
+	} while (symbol < limit);
+
+	return symbol;
+}
+
+/* Decode a bittree starting from the least significant bit. */
+static __always_inline void rc_bittree_reverse(struct rc_dec *rc, uint16_t *probs,
+											   uint32_t *dest, uint32_t limit)
+{
+	uint32_t symbol = 1;
+	uint32_t i = 0;
+
+	do
+	{
+		if (rc_bit(rc, &probs[symbol]))
+		{
+			symbol = (symbol << 1) + 1;
+			*dest += 1 << i;
+		}
+		else
+		{
+			symbol <<= 1;
+		}
+	} while (++i < limit);
+}
+
+/* Decode direct bits (fixed fifty-fifty probability) */
+static inline void rc_direct(struct rc_dec *rc, uint32_t *dest, uint32_t limit)
+{
+	uint32_t mask;
+
+	do
+	{
+		rc_normalize(rc);
+		rc->range >>= 1;
+		rc->code -= rc->range;
+		mask = (uint32_t)0 - (rc->code >> 31);
+		rc->code += rc->range & mask;
+		*dest = (*dest << 1) + (mask + 1);
+	} while (--limit > 0);
+}
+
+/********
+ * LZMA *
+ ********/
+
+/* Get pointer to literal coder probability array. */
+static uint16_t *lzma_literal_probs(struct xz_dec_lzma2 *s)
+{
+	uint32_t prev_byte = dict_get(&s->dict, 0);
+	uint32_t low = prev_byte >> (8 - s->lzma.lc);
+	uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
+	return s->lzma.literal[low + high];
+}
+
+/* Decode a literal (one 8-bit byte) */
+static void lzma_literal(struct xz_dec_lzma2 *s)
+{
+	uint16_t *probs;
+	uint32_t symbol;
+	uint32_t match_byte;
+	uint32_t match_bit;
+	uint32_t offset;
+	uint32_t i;
+
+	probs = lzma_literal_probs(s);
+
+	if (lzma_state_is_literal(s->lzma.state))
+	{
+		symbol = rc_bittree(&s->rc, probs, 0x100);
+	}
+	else
+	{
+		symbol = 1;
+		match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
+		offset = 0x100;
+
+		do
+		{
+			match_bit = match_byte & offset;
+			match_byte <<= 1;
+			i = offset + match_bit + symbol;
+
+			if (rc_bit(&s->rc, &probs[i]))
+			{
+				symbol = (symbol << 1) + 1;
+				offset &= match_bit;
+			}
+			else
+			{
+				symbol <<= 1;
+				offset &= ~match_bit;
+			}
+		} while (symbol < 0x100);
+	}
+
+	dict_put(&s->dict, (uint8_t)symbol);
+	lzma_state_literal(&s->lzma.state);
+}
+
+/* Decode the length of the match into s->lzma.len. */
+static void lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l, uint32_t pos_state)
+{
+	uint16_t *probs;
+	uint32_t limit;
+
+	if (!rc_bit(&s->rc, &l->choice))
+	{
+		probs = l->low[pos_state];
+		limit = LEN_LOW_SYMBOLS;
+		s->lzma.len = MATCH_LEN_MIN;
+	}
+	else
+	{
+		if (!rc_bit(&s->rc, &l->choice2))
+		{
+			probs = l->mid[pos_state];
+			limit = LEN_MID_SYMBOLS;
+			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
+		}
+		else
+		{
+			probs = l->high;
+			limit = LEN_HIGH_SYMBOLS;
+			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS;
+		}
+	}
+
+	s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
+}
+
+/* Decode a match. The distance will be stored in s->lzma.rep0. */
+static void lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+{
+	uint16_t *probs;
+	uint32_t dist_slot;
+	uint32_t limit;
+
+	lzma_state_match(&s->lzma.state);
+
+	s->lzma.rep3 = s->lzma.rep2;
+	s->lzma.rep2 = s->lzma.rep1;
+	s->lzma.rep1 = s->lzma.rep0;
+
+	lzma_len(s, &s->lzma.match_len_dec, pos_state);
+
+	probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
+	dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
+
+	if (dist_slot < DIST_MODEL_START)
+	{
+		s->lzma.rep0 = dist_slot;
+	}
+	else
+	{
+		limit = (dist_slot >> 1) - 1;
+		s->lzma.rep0 = 2 + (dist_slot & 1);
+
+		if (dist_slot < DIST_MODEL_END)
+		{
+			s->lzma.rep0 <<= limit;
+			probs = s->lzma.dist_special + s->lzma.rep0 - dist_slot - 1;
+			rc_bittree_reverse(&s->rc, probs, &s->lzma.rep0, limit);
+		}
+		else
+		{
+			rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
+			s->lzma.rep0 <<= ALIGN_BITS;
+			rc_bittree_reverse(&s->rc, s->lzma.dist_align, &s->lzma.rep0, ALIGN_BITS);
+		}
+	}
+}
+
+/*
+ * Decode a repeated match. The distance is one of the four most recently
+ * seen matches. The distance will be stored in s->lzma.rep0.
+ */
+static void lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+{
+	uint32_t tmp;
+
+	if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state]))
+	{
+		if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[s->lzma.state][pos_state]))
+		{
+			lzma_state_short_rep(&s->lzma.state);
+			s->lzma.len = 1;
+			return;
+		}
+	}
+	else
+	{
+		if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state]))
+		{
+			tmp = s->lzma.rep1;
+		}
+		else
+		{
+			if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state]))
+			{
+				tmp = s->lzma.rep2;
+			}
+			else
+			{
+				tmp = s->lzma.rep3;
+				s->lzma.rep3 = s->lzma.rep2;
+			}
+
+			s->lzma.rep2 = s->lzma.rep1;
+		}
+
+		s->lzma.rep1 = s->lzma.rep0;
+		s->lzma.rep0 = tmp;
+	}
+
+	lzma_state_long_rep(&s->lzma.state);
+	lzma_len(s, &s->lzma.rep_len_dec, pos_state);
+}
+
+/* LZMA decoder core */
+static bool lzma_main(struct xz_dec_lzma2 *s)
+{
+	uint32_t pos_state;
+
+	/*
+	 * If the dictionary was reached during the previous call, try to
+	 * finish the possibly pending repeat in the dictionary.
+	 */
+	if (dict_has_space(&s->dict) && s->lzma.len > 0)
+		dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
+
+	/*
+	 * Decode more LZMA symbols. One iteration may consume up to
+	 * LZMA_IN_REQUIRED - 1 bytes.
+	 */
+	while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc))
+	{
+		pos_state = s->dict.pos & s->lzma.pos_mask;
+
+		if (!rc_bit(&s->rc, &s->lzma.is_match[s->lzma.state][pos_state]))
+		{
+			lzma_literal(s);
+		}
+		else
+		{
+			if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
+				lzma_rep_match(s, pos_state);
+			else
+				lzma_match(s, pos_state);
+
+			if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
+				return false;
+		}
+	}
+
+	/*
+	 * Having the range decoder always normalized when we are outside
+	 * this function makes it easier to correctly handle end of the chunk.
+	 */
+	rc_normalize(&s->rc);
+
+	return true;
+}
+
+/*
+ * Reset the LZMA decoder and range decoder state. Dictionary is nore reset
+ * here, because LZMA state may be reset without resetting the dictionary.
+ */
+static void lzma_reset(struct xz_dec_lzma2 *s)
+{
+	uint16_t *probs;
+	size_t i;
+
+	s->lzma.state = STATE_LIT_LIT;
+	s->lzma.rep0 = 0;
+	s->lzma.rep1 = 0;
+	s->lzma.rep2 = 0;
+	s->lzma.rep3 = 0;
+
+	/*
+	 * All probabilities are initialized to the same value. This hack
+	 * makes the code smaller by avoiding a separate loop for each
+	 * probability array.
+	 *
+	 * This could be optimized so that only that part of literal
+	 * probabilities that are actually required. In the common case
+	 * we would write 12 KiB less.
+	 */
+	probs = s->lzma.is_match[0];
+	for (i = 0; i < PROBS_TOTAL; ++i)
+		probs[i] = RC_BIT_MODEL_TOTAL / 2;
+
+	rc_reset(&s->rc);
+}
+
+/*
+ * Decode and validate LZMA properties (lc/lp/pb) and calculate the bit masks
+ * from the decoded lp and pb values. On success, the LZMA decoder state is
+ * reset and true is returned.
+ */
+static bool lzma_props(struct xz_dec_lzma2 *s, uint8_t props)
+{
+	if (props > (4 * 5 + 4) * 9 + 8)
+		return false;
+
+	s->lzma.pos_mask = 0;
+	while (props >= 9 * 5)
+	{
+		props -= 9 * 5;
+		++s->lzma.pos_mask;
+	}
+
+	s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
+
+	s->lzma.literal_pos_mask = 0;
+	while (props >= 9)
+	{
+		props -= 9;
+		++s->lzma.literal_pos_mask;
+	}
+
+	s->lzma.lc = props;
+
+	if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
+		return false;
+
+	s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
+
+	lzma_reset(s);
+
+	return true;
+}
+
+/*********
+ * LZMA2 *
+ *********/
+
+/*
+ * The LZMA decoder assumes that if the input limit (s->rc.in_limit) hasn't
+ * been exceeded, it is safe to read up to LZMA_IN_REQUIRED bytes. This
+ * wrapper function takes care of making the LZMA decoder's assumption safe.
+ *
+ * As long as there is plenty of input left to be decoded in the current LZMA
+ * chunk, we decode directly from the caller-supplied input buffer until
+ * there's LZMA_IN_REQUIRED bytes left. Those remaining bytes are copied into
+ * s->temp.buf, which (hopefully) gets filled on the next call to this
+ * function. We decode a few bytes from the temporary buffer so that we can
+ * continue decoding from the caller-supplied input buffer again.
+ */
+static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
+{
+	size_t in_avail;
+	uint32_t tmp;
+
+	in_avail = b->in_size - b->in_pos;
+	if (s->temp.size > 0 || s->lzma2.compressed == 0)
+	{
+		tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
+		if (tmp > s->lzma2.compressed - s->temp.size)
+			tmp = s->lzma2.compressed - s->temp.size;
+		if (tmp > in_avail)
+			tmp = in_avail;
+
+		memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
+
+		if (s->temp.size + tmp == s->lzma2.compressed)
+		{
+			memzero(s->temp.buf + s->temp.size + tmp, sizeof(s->temp.buf) - s->temp.size - tmp);
+			s->rc.in_limit = s->temp.size + tmp;
+		}
+		else if (s->temp.size + tmp < LZMA_IN_REQUIRED)
+		{
+			s->temp.size += tmp;
+			b->in_pos += tmp;
+			return true;
+		}
+		else
+		{
+			s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
+		}
+
+		s->rc.in = s->temp.buf;
+		s->rc.in_pos = 0;
+
+		if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
+			return false;
+
+		s->lzma2.compressed -= s->rc.in_pos;
+
+		if (s->rc.in_pos < s->temp.size)
+		{
+			s->temp.size -= s->rc.in_pos;
+			memmove(s->temp.buf, s->temp.buf + s->rc.in_pos, s->temp.size);
+			return true;
+		}
+
+		b->in_pos += s->rc.in_pos - s->temp.size;
+		s->temp.size = 0;
+	}
+
+	in_avail = b->in_size - b->in_pos;
+	if (in_avail >= LZMA_IN_REQUIRED)
+	{
+		s->rc.in = b->in;
+		s->rc.in_pos = b->in_pos;
+
+		if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
+			s->rc.in_limit = b->in_pos + s->lzma2.compressed;
+		else
+			s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
+
+		if (!lzma_main(s))
+			return false;
+
+		in_avail = s->rc.in_pos - b->in_pos;
+		if (in_avail > s->lzma2.compressed)
+			return false;
+
+		s->lzma2.compressed -= in_avail;
+		b->in_pos = s->rc.in_pos;
+	}
+
+	in_avail = b->in_size - b->in_pos;
+	if (in_avail < LZMA_IN_REQUIRED)
+	{
+		if (in_avail > s->lzma2.compressed)
+			in_avail = s->lzma2.compressed;
+
+		memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
+		s->temp.size = in_avail;
+		b->in_pos += in_avail;
+	}
+
+	return true;
+}
+
+/*
+ * Take care of the LZMA2 control layer, and forward the job of actual LZMA
+ * decoding or copying of uncompressed chunks to other functions.
+ */
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b)
+{
+	uint32_t tmp;
+
+	while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN)
+	{
+		switch (s->lzma2.sequence)
+		{
+		case SEQ_CONTROL:
+			/*
+			 * LZMA2 control byte
+			 *
+			 * Exact values:
+			 *   0x00   End marker
+			 *   0x01   Dictionary reset followed by
+			 *          an uncompressed chunk
+			 *   0x02   Uncompressed chunk (no dictionary reset)
+			 *
+			 * Highest three bits (s->control & 0xE0):
+			 *   0xE0   Dictionary reset, new properties and state
+			 *          reset, followed by LZMA compressed chunk
+			 *   0xC0   New properties and state reset, followed
+			 *          by LZMA compressed chunk (no dictionary
+			 *          reset)
+			 *   0xA0   State reset using old properties,
+			 *          followed by LZMA compressed chunk (no
+			 *          dictionary reset)
+			 *   0x80   LZMA chunk (no dictionary or state reset)
+			 *
+			 * For LZMA compressed chunks, the lowest five bits
+			 * (s->control & 1F) are the highest bits of the
+			 * uncompressed size (bits 16-20).
+			 *
+			 * A new LZMA2 stream must begin with a dictionary
+			 * reset. The first LZMA chunk must set new
+			 * properties and reset the LZMA state.
+			 *
+			 * Values that don't match anything described above
+			 * are invalid and we return XZ_DATA_ERROR.
+			 */
+			tmp = b->in[b->in_pos++];
+
+			if (tmp == 0x00)
+				return XZ_STREAM_END;
+
+			if (tmp >= 0xE0 || tmp == 0x01)
+			{
+				s->lzma2.need_props = true;
+				s->lzma2.need_dict_reset = false;
+				dict_reset(&s->dict, b);
+			}
+			else if (s->lzma2.need_dict_reset)
+			{
+				return XZ_DATA_ERROR;
+			}
+
+			if (tmp >= 0x80)
+			{
+				s->lzma2.uncompressed = (tmp & 0x1F) << 16;
+				s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
+
+				if (tmp >= 0xC0)
+				{
+					/*
+					 * When there are new properties,
+					 * state reset is done at
+					 * SEQ_PROPERTIES.
+					 */
+					s->lzma2.need_props = false;
+					s->lzma2.next_sequence = SEQ_PROPERTIES;
+				}
+				else if (s->lzma2.need_props)
+				{
+					return XZ_DATA_ERROR;
+				}
+				else
+				{
+					s->lzma2.next_sequence = SEQ_LZMA_PREPARE;
+					if (tmp >= 0xA0)
+						lzma_reset(s);
+				}
+			}
+			else
+			{
+				if (tmp > 0x02)
+					return XZ_DATA_ERROR;
+
+				s->lzma2.sequence = SEQ_COMPRESSED_0;
+				s->lzma2.next_sequence = SEQ_COPY;
+			}
+
+			break;
+
+		case SEQ_UNCOMPRESSED_1:
+			s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] << 8;
+			s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
+			break;
+
+		case SEQ_UNCOMPRESSED_2:
+			s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] + 1;
+			s->lzma2.sequence = SEQ_COMPRESSED_0;
+			break;
+
+		case SEQ_COMPRESSED_0:
+			s->lzma2.compressed = (uint32_t)b->in[b->in_pos++] << 8;
+			s->lzma2.sequence = SEQ_COMPRESSED_1;
+			break;
+
+		case SEQ_COMPRESSED_1:
+			s->lzma2.compressed += (uint32_t)b->in[b->in_pos++] + 1;
+			s->lzma2.sequence = s->lzma2.next_sequence;
+			break;
+
+		case SEQ_PROPERTIES:
+			if (!lzma_props(s, b->in[b->in_pos++]))
+				return XZ_DATA_ERROR;
+
+			s->lzma2.sequence = SEQ_LZMA_PREPARE;
+
+		case SEQ_LZMA_PREPARE:
+			if (s->lzma2.compressed < RC_INIT_BYTES)
+				return XZ_DATA_ERROR;
+
+			if (!rc_read_init(&s->rc, b))
+				return XZ_OK;
+
+			s->lzma2.compressed -= RC_INIT_BYTES;
+			s->lzma2.sequence = SEQ_LZMA_RUN;
+
+		case SEQ_LZMA_RUN:
+			/*
+			 * Set dictionary limit to indicate how much we want
+			 * to be encoded at maximum. Decode new data into the
+			 * dictionary. Flush the new data from dictionary to
+			 * b->out. Check if we finished decoding this chunk.
+			 * In case the dictionary got full but we didn't fill
+			 * the output buffer yet, we may run this loop
+			 * multiple times without changing s->lzma2.sequence.
+			 */
+			dict_limit(&s->dict,
+					   min_t(size_t, b->out_size - b->out_pos, s->lzma2.uncompressed));
+			if (!lzma2_lzma(s, b))
+				return XZ_DATA_ERROR;
+
+			s->lzma2.uncompressed -= dict_flush(&s->dict, b);
+
+			if (s->lzma2.uncompressed == 0)
+			{
+				if (s->lzma2.compressed > 0 || s->lzma.len > 0 || !rc_is_finished(&s->rc))
+					return XZ_DATA_ERROR;
+
+				rc_reset(&s->rc);
+				s->lzma2.sequence = SEQ_CONTROL;
+			}
+			else if (b->out_pos == b->out_size ||
+					 (b->in_pos == b->in_size && s->temp.size < s->lzma2.compressed))
+			{
+				return XZ_OK;
+			}
+
+			break;
+
+		case SEQ_COPY:
+			dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
+			if (s->lzma2.compressed > 0)
+				return XZ_OK;
+
+			s->lzma2.sequence = SEQ_CONTROL;
+			break;
+		}
+	}
+
+	return XZ_OK;
+}
+
+XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode, uint32_t dict_max)
+{
+	struct xz_dec_lzma2 *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s == NULL)
+		return NULL;
+
+	s->dict.mode = mode;
+	s->dict.size_max = dict_max;
+
+	if (DEC_IS_PREALLOC(mode))
+	{
+		s->dict.buf = vmalloc(dict_max);
+		if (s->dict.buf == NULL)
+		{
+			kfree(s);
+			return NULL;
+		}
+	}
+	else if (DEC_IS_DYNALLOC(mode))
+	{
+		s->dict.buf = NULL;
+		s->dict.allocated = 0;
+	}
+
+	return s;
+}
+
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
+{
+	/* This limits dictionary size to 3 GiB to keep parsing simpler. */
+	if (props > 39)
+		return XZ_OPTIONS_ERROR;
+
+	s->dict.size = 2 + (props & 1);
+	s->dict.size <<= (props >> 1) + 11;
+
+	if (DEC_IS_MULTI(s->dict.mode))
+	{
+		if (s->dict.size > s->dict.size_max)
+			return XZ_MEMLIMIT_ERROR;
+
+		s->dict.end = s->dict.size;
+
+		if (DEC_IS_DYNALLOC(s->dict.mode))
+		{
+			if (s->dict.allocated < s->dict.size)
+			{
+				vfree(s->dict.buf);
+				s->dict.buf = vmalloc(s->dict.size);
+				if (s->dict.buf == NULL)
+				{
+					s->dict.allocated = 0;
+					return XZ_MEM_ERROR;
+				}
+			}
+		}
+	}
+
+	s->lzma.len = 0;
+
+	s->lzma2.sequence = SEQ_CONTROL;
+	s->lzma2.need_dict_reset = true;
+
+	s->temp.size = 0;
+
+	return XZ_OK;
+}
+
+XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s)
+{
+	if (DEC_IS_MULTI(s->dict.mode))
+		vfree(s->dict.buf);
+
+	kfree(s);
+}
diff --git a/libraries/xz-embedded/src/xz_dec_stream.c b/libraries/xz-embedded/src/xz_dec_stream.c
new file mode 100644
index 00000000..6e935ded
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_dec_stream.c
@@ -0,0 +1,860 @@
+/*
+ * .xz Stream decoder
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#include "xz_private.h"
+#include "xz_stream.h"
+
+#ifdef XZ_USE_CRC64
+#define IS_CRC64(check_type) ((check_type) == XZ_CHECK_CRC64)
+#else
+#define IS_CRC64(check_type) false
+#endif
+
+/* Hash used to validate the Index field */
+struct xz_dec_hash
+{
+	vli_type unpadded;
+	vli_type uncompressed;
+	uint32_t crc32;
+};
+
+struct xz_dec
+{
+	/* Position in dec_main() */
+	enum
+	{
+		SEQ_STREAM_HEADER,
+		SEQ_BLOCK_START,
+		SEQ_BLOCK_HEADER,
+		SEQ_BLOCK_UNCOMPRESS,
+		SEQ_BLOCK_PADDING,
+		SEQ_BLOCK_CHECK,
+		SEQ_INDEX,
+		SEQ_INDEX_PADDING,
+		SEQ_INDEX_CRC32,
+		SEQ_STREAM_FOOTER
+	} sequence;
+
+	/* Position in variable-length integers and Check fields */
+	uint32_t pos;
+
+	/* Variable-length integer decoded by dec_vli() */
+	vli_type vli;
+
+	/* Saved in_pos and out_pos */
+	size_t in_start;
+	size_t out_start;
+
+#ifdef XZ_USE_CRC64
+	/* CRC32 or CRC64 value in Block or CRC32 value in Index */
+	uint64_t crc;
+#else
+	/* CRC32 value in Block or Index */
+	uint32_t crc;
+#endif
+
+	/* Type of the integrity check calculated from uncompressed data */
+	enum xz_check check_type;
+
+	/* Operation mode */
+	enum xz_mode mode;
+
+	/*
+	 * True if the next call to xz_dec_run() is allowed to return
+	 * XZ_BUF_ERROR.
+	 */
+	bool allow_buf_error;
+
+	/* Information stored in Block Header */
+	struct
+	{
+		/*
+		 * Value stored in the Compressed Size field, or
+		 * VLI_UNKNOWN if Compressed Size is not present.
+		 */
+		vli_type compressed;
+
+		/*
+		 * Value stored in the Uncompressed Size field, or
+		 * VLI_UNKNOWN if Uncompressed Size is not present.
+		 */
+		vli_type uncompressed;
+
+		/* Size of the Block Header field */
+		uint32_t size;
+	} block_header;
+
+	/* Information collected when decoding Blocks */
+	struct
+	{
+		/* Observed compressed size of the current Block */
+		vli_type compressed;
+
+		/* Observed uncompressed size of the current Block */
+		vli_type uncompressed;
+
+		/* Number of Blocks decoded so far */
+		vli_type count;
+
+		/*
+		 * Hash calculated from the Block sizes. This is used to
+		 * validate the Index field.
+		 */
+		struct xz_dec_hash hash;
+	} block;
+
+	/* Variables needed when verifying the Index field */
+	struct
+	{
+		/* Position in dec_index() */
+		enum
+		{
+			SEQ_INDEX_COUNT,
+			SEQ_INDEX_UNPADDED,
+			SEQ_INDEX_UNCOMPRESSED
+		} sequence;
+
+		/* Size of the Index in bytes */
+		vli_type size;
+
+		/* Number of Records (matches block.count in valid files) */
+		vli_type count;
+
+		/*
+		 * Hash calculated from the Records (matches block.hash in
+		 * valid files).
+		 */
+		struct xz_dec_hash hash;
+	} index;
+
+	/*
+	 * Temporary buffer needed to hold Stream Header, Block Header,
+	 * and Stream Footer. The Block Header is the biggest (1 KiB)
+	 * so we reserve space according to that. buf[] has to be aligned
+	 * to a multiple of four bytes; the size_t variables before it
+	 * should guarantee this.
+	 */
+	struct
+	{
+		size_t pos;
+		size_t size;
+		uint8_t buf[1024];
+	} temp;
+
+	struct xz_dec_lzma2 *lzma2;
+
+#ifdef XZ_DEC_BCJ
+	struct xz_dec_bcj *bcj;
+	bool bcj_active;
+#endif
+};
+
+#ifdef XZ_DEC_ANY_CHECK
+/* Sizes of the Check field with different Check IDs */
+static const uint8_t check_sizes[16] = {0,  4,  4,  4,  8,  8,  8,  16,
+										16, 16, 32, 32, 32, 64, 64, 64};
+#endif
+
+/*
+ * Fill s->temp by copying data starting from b->in[b->in_pos]. Caller
+ * must have set s->temp.pos to indicate how much data we are supposed
+ * to copy into s->temp.buf. Return true once s->temp.pos has reached
+ * s->temp.size.
+ */
+static bool fill_temp(struct xz_dec *s, struct xz_buf *b)
+{
+	size_t copy_size = min_t(size_t, b->in_size - b->in_pos, s->temp.size - s->temp.pos);
+
+	memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
+	b->in_pos += copy_size;
+	s->temp.pos += copy_size;
+
+	if (s->temp.pos == s->temp.size)
+	{
+		s->temp.pos = 0;
+		return true;
+	}
+
+	return false;
+}
+
+/* Decode a variable-length integer (little-endian base-128 encoding) */
+static enum xz_ret dec_vli(struct xz_dec *s, const uint8_t *in, size_t *in_pos, size_t in_size)
+{
+	uint8_t byte;
+
+	if (s->pos == 0)
+		s->vli = 0;
+
+	while (*in_pos < in_size)
+	{
+		byte = in[*in_pos];
+		++*in_pos;
+
+		s->vli |= (vli_type)(byte & 0x7F) << s->pos;
+
+		if ((byte & 0x80) == 0)
+		{
+			/* Don't allow non-minimal encodings. */
+			if (byte == 0 && s->pos != 0)
+				return XZ_DATA_ERROR;
+
+			s->pos = 0;
+			return XZ_STREAM_END;
+		}
+
+		s->pos += 7;
+		if (s->pos == 7 * VLI_BYTES_MAX)
+			return XZ_DATA_ERROR;
+	}
+
+	return XZ_OK;
+}
+
+/*
+ * Decode the Compressed Data field from a Block. Update and validate
+ * the observed compressed and uncompressed sizes of the Block so that
+ * they don't exceed the values possibly stored in the Block Header
+ * (validation assumes that no integer overflow occurs, since vli_type
+ * is normally uint64_t). Update the CRC32 or CRC64 value if presence of
+ * the CRC32 or CRC64 field was indicated in Stream Header.
+ *
+ * Once the decoding is finished, validate that the observed sizes match
+ * the sizes possibly stored in the Block Header. Update the hash and
+ * Block count, which are later used to validate the Index field.
+ */
+static enum xz_ret dec_block(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	s->in_start = b->in_pos;
+	s->out_start = b->out_pos;
+
+#ifdef XZ_DEC_BCJ
+	if (s->bcj_active)
+		ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
+	else
+#endif
+		ret = xz_dec_lzma2_run(s->lzma2, b);
+
+	s->block.compressed += b->in_pos - s->in_start;
+	s->block.uncompressed += b->out_pos - s->out_start;
+
+	/*
+	 * There is no need to separately check for VLI_UNKNOWN, since
+	 * the observed sizes are always smaller than VLI_UNKNOWN.
+	 */
+	if (s->block.compressed > s->block_header.compressed ||
+		s->block.uncompressed > s->block_header.uncompressed)
+		return XZ_DATA_ERROR;
+
+	if (s->check_type == XZ_CHECK_CRC32)
+		s->crc = xz_crc32(b->out + s->out_start, b->out_pos - s->out_start, s->crc);
+#ifdef XZ_USE_CRC64
+	else if (s->check_type == XZ_CHECK_CRC64)
+		s->crc = xz_crc64(b->out + s->out_start, b->out_pos - s->out_start, s->crc);
+#endif
+
+	if (ret == XZ_STREAM_END)
+	{
+		if (s->block_header.compressed != VLI_UNKNOWN &&
+			s->block_header.compressed != s->block.compressed)
+			return XZ_DATA_ERROR;
+
+		if (s->block_header.uncompressed != VLI_UNKNOWN &&
+			s->block_header.uncompressed != s->block.uncompressed)
+			return XZ_DATA_ERROR;
+
+		s->block.hash.unpadded += s->block_header.size + s->block.compressed;
+
+#ifdef XZ_DEC_ANY_CHECK
+		s->block.hash.unpadded += check_sizes[s->check_type];
+#else
+		if (s->check_type == XZ_CHECK_CRC32)
+			s->block.hash.unpadded += 4;
+		else if (IS_CRC64(s->check_type))
+			s->block.hash.unpadded += 8;
+#endif
+
+		s->block.hash.uncompressed += s->block.uncompressed;
+		s->block.hash.crc32 = xz_crc32((const uint8_t *)&s->block.hash, sizeof(s->block.hash),
+									   s->block.hash.crc32);
+
+		++s->block.count;
+	}
+
+	return ret;
+}
+
+/* Update the Index size and the CRC32 value. */
+static void index_update(struct xz_dec *s, const struct xz_buf *b)
+{
+	size_t in_used = b->in_pos - s->in_start;
+	s->index.size += in_used;
+	s->crc = xz_crc32(b->in + s->in_start, in_used, s->crc);
+}
+
+/*
+ * Decode the Number of Records, Unpadded Size, and Uncompressed Size
+ * fields from the Index field. That is, Index Padding and CRC32 are not
+ * decoded by this function.
+ *
+ * This can return XZ_OK (more input needed), XZ_STREAM_END (everything
+ * successfully decoded), or XZ_DATA_ERROR (input is corrupt).
+ */
+static enum xz_ret dec_index(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	do
+	{
+		ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
+		if (ret != XZ_STREAM_END)
+		{
+			index_update(s, b);
+			return ret;
+		}
+
+		switch (s->index.sequence)
+		{
+		case SEQ_INDEX_COUNT:
+			s->index.count = s->vli;
+
+			/*
+			 * Validate that the Number of Records field
+			 * indicates the same number of Records as
+			 * there were Blocks in the Stream.
+			 */
+			if (s->index.count != s->block.count)
+				return XZ_DATA_ERROR;
+
+			s->index.sequence = SEQ_INDEX_UNPADDED;
+			break;
+
+		case SEQ_INDEX_UNPADDED:
+			s->index.hash.unpadded += s->vli;
+			s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
+			break;
+
+		case SEQ_INDEX_UNCOMPRESSED:
+			s->index.hash.uncompressed += s->vli;
+			s->index.hash.crc32 = xz_crc32((const uint8_t *)&s->index.hash,
+										   sizeof(s->index.hash), s->index.hash.crc32);
+			--s->index.count;
+			s->index.sequence = SEQ_INDEX_UNPADDED;
+			break;
+		}
+	} while (s->index.count > 0);
+
+	return XZ_STREAM_END;
+}
+
+/*
+ * Validate that the next four or eight input bytes match the value
+ * of s->crc. s->pos must be zero when starting to validate the first byte.
+ * The "bits" argument allows using the same code for both CRC32 and CRC64.
+ */
+static enum xz_ret crc_validate(struct xz_dec *s, struct xz_buf *b, uint32_t bits)
+{
+	do
+	{
+		if (b->in_pos == b->in_size)
+			return XZ_OK;
+
+		if (((s->crc >> s->pos) & 0xFF) != b->in[b->in_pos++])
+			return XZ_DATA_ERROR;
+
+		s->pos += 8;
+
+	} while (s->pos < bits);
+
+	s->crc = 0;
+	s->pos = 0;
+
+	return XZ_STREAM_END;
+}
+
+#ifdef XZ_DEC_ANY_CHECK
+/*
+ * Skip over the Check field when the Check ID is not supported.
+ * Returns true once the whole Check field has been skipped over.
+ */
+static bool check_skip(struct xz_dec *s, struct xz_buf *b)
+{
+	while (s->pos < check_sizes[s->check_type])
+	{
+		if (b->in_pos == b->in_size)
+			return false;
+
+		++b->in_pos;
+		++s->pos;
+	}
+
+	s->pos = 0;
+
+	return true;
+}
+#endif
+
+/* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */
+static enum xz_ret dec_stream_header(struct xz_dec *s)
+{
+	if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
+		return XZ_FORMAT_ERROR;
+
+	if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0) !=
+		get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))
+		return XZ_DATA_ERROR;
+
+	if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)
+		return XZ_OPTIONS_ERROR;
+
+	/*
+	 * Of integrity checks, we support none (Check ID = 0),
+	 * CRC32 (Check ID = 1), and optionally CRC64 (Check ID = 4).
+	 * However, if XZ_DEC_ANY_CHECK is defined, we will accept other
+	 * check types too, but then the check won't be verified and
+	 * a warning (XZ_UNSUPPORTED_CHECK) will be given.
+	 */
+	s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
+
+#ifdef XZ_DEC_ANY_CHECK
+	if (s->check_type > XZ_CHECK_MAX)
+		return XZ_OPTIONS_ERROR;
+
+	if (s->check_type > XZ_CHECK_CRC32 && !IS_CRC64(s->check_type))
+		return XZ_UNSUPPORTED_CHECK;
+#else
+	if (s->check_type > XZ_CHECK_CRC32 && !IS_CRC64(s->check_type))
+		return XZ_OPTIONS_ERROR;
+#endif
+
+	return XZ_OK;
+}
+
+/* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */
+static enum xz_ret dec_stream_footer(struct xz_dec *s)
+{
+	if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
+		return XZ_DATA_ERROR;
+
+	if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))
+		return XZ_DATA_ERROR;
+
+	/*
+	 * Validate Backward Size. Note that we never added the size of the
+	 * Index CRC32 field to s->index.size, thus we use s->index.size / 4
+	 * instead of s->index.size / 4 - 1.
+	 */
+	if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
+		return XZ_DATA_ERROR;
+
+	if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->check_type)
+		return XZ_DATA_ERROR;
+
+	/*
+	 * Use XZ_STREAM_END instead of XZ_OK to be more convenient
+	 * for the caller.
+	 */
+	return XZ_STREAM_END;
+}
+
+/* Decode the Block Header and initialize the filter chain. */
+static enum xz_ret dec_block_header(struct xz_dec *s)
+{
+	enum xz_ret ret;
+
+	/*
+	 * Validate the CRC32. We know that the temp buffer is at least
+	 * eight bytes so this is safe.
+	 */
+	s->temp.size -= 4;
+	if (xz_crc32(s->temp.buf, s->temp.size, 0) != get_le32(s->temp.buf + s->temp.size))
+		return XZ_DATA_ERROR;
+
+	s->temp.pos = 2;
+
+/*
+ * Catch unsupported Block Flags. We support only one or two filters
+ * in the chain, so we catch that with the same test.
+ */
+#ifdef XZ_DEC_BCJ
+	if (s->temp.buf[1] & 0x3E)
+#else
+		if (s->temp.buf[1] & 0x3F)
+#endif
+			return XZ_OPTIONS_ERROR;
+
+	/* Compressed Size */
+	if (s->temp.buf[1] & 0x40)
+	{
+		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
+			return XZ_DATA_ERROR;
+
+		s->block_header.compressed = s->vli;
+	}
+	else
+	{
+		s->block_header.compressed = VLI_UNKNOWN;
+	}
+
+	/* Uncompressed Size */
+	if (s->temp.buf[1] & 0x80)
+	{
+		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
+			return XZ_DATA_ERROR;
+
+		s->block_header.uncompressed = s->vli;
+	}
+	else
+	{
+		s->block_header.uncompressed = VLI_UNKNOWN;
+	}
+
+#ifdef XZ_DEC_BCJ
+	/* If there are two filters, the first one must be a BCJ filter. */
+	s->bcj_active = s->temp.buf[1] & 0x01;
+	if (s->bcj_active)
+	{
+		if (s->temp.size - s->temp.pos < 2)
+			return XZ_OPTIONS_ERROR;
+
+		ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
+		if (ret != XZ_OK)
+			return ret;
+
+		/*
+		 * We don't support custom start offset,
+		 * so Size of Properties must be zero.
+		 */
+		if (s->temp.buf[s->temp.pos++] != 0x00)
+			return XZ_OPTIONS_ERROR;
+	}
+#endif
+
+	/* Valid Filter Flags always take at least two bytes. */
+	if (s->temp.size - s->temp.pos < 2)
+		return XZ_DATA_ERROR;
+
+	/* Filter ID = LZMA2 */
+	if (s->temp.buf[s->temp.pos++] != 0x21)
+		return XZ_OPTIONS_ERROR;
+
+	/* Size of Properties = 1-byte Filter Properties */
+	if (s->temp.buf[s->temp.pos++] != 0x01)
+		return XZ_OPTIONS_ERROR;
+
+	/* Filter Properties contains LZMA2 dictionary size. */
+	if (s->temp.size - s->temp.pos < 1)
+		return XZ_DATA_ERROR;
+
+	ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
+	if (ret != XZ_OK)
+		return ret;
+
+	/* The rest must be Header Padding. */
+	while (s->temp.pos < s->temp.size)
+		if (s->temp.buf[s->temp.pos++] != 0x00)
+			return XZ_OPTIONS_ERROR;
+
+	s->temp.pos = 0;
+	s->block.compressed = 0;
+	s->block.uncompressed = 0;
+
+	return XZ_OK;
+}
+
+static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	/*
+	 * Store the start position for the case when we are in the middle
+	 * of the Index field.
+	 */
+	s->in_start = b->in_pos;
+
+	while (true)
+	{
+		switch (s->sequence)
+		{
+		case SEQ_STREAM_HEADER:
+			/*
+			 * Stream Header is copied to s->temp, and then
+			 * decoded from there. This way if the caller
+			 * gives us only little input at a time, we can
+			 * still keep the Stream Header decoding code
+			 * simple. Similar approach is used in many places
+			 * in this file.
+			 */
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			/*
+			 * If dec_stream_header() returns
+			 * XZ_UNSUPPORTED_CHECK, it is still possible
+			 * to continue decoding if working in multi-call
+			 * mode. Thus, update s->sequence before calling
+			 * dec_stream_header().
+			 */
+			s->sequence = SEQ_BLOCK_START;
+
+			ret = dec_stream_header(s);
+			if (ret != XZ_OK)
+				return ret;
+
+		case SEQ_BLOCK_START:
+			/* We need one byte of input to continue. */
+			if (b->in_pos == b->in_size)
+				return XZ_OK;
+
+			/* See if this is the beginning of the Index field. */
+			if (b->in[b->in_pos] == 0)
+			{
+				s->in_start = b->in_pos++;
+				s->sequence = SEQ_INDEX;
+				break;
+			}
+
+			/*
+			 * Calculate the size of the Block Header and
+			 * prepare to decode it.
+			 */
+			s->block_header.size = ((uint32_t)b->in[b->in_pos] + 1) * 4;
+
+			s->temp.size = s->block_header.size;
+			s->temp.pos = 0;
+			s->sequence = SEQ_BLOCK_HEADER;
+
+		case SEQ_BLOCK_HEADER:
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			ret = dec_block_header(s);
+			if (ret != XZ_OK)
+				return ret;
+
+			s->sequence = SEQ_BLOCK_UNCOMPRESS;
+
+		case SEQ_BLOCK_UNCOMPRESS:
+			ret = dec_block(s, b);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->sequence = SEQ_BLOCK_PADDING;
+
+		case SEQ_BLOCK_PADDING:
+			/*
+			 * Size of Compressed Data + Block Padding
+			 * must be a multiple of four. We don't need
+			 * s->block.compressed for anything else
+			 * anymore, so we use it here to test the size
+			 * of the Block Padding field.
+			 */
+			while (s->block.compressed & 3)
+			{
+				if (b->in_pos == b->in_size)
+					return XZ_OK;
+
+				if (b->in[b->in_pos++] != 0)
+					return XZ_DATA_ERROR;
+
+				++s->block.compressed;
+			}
+
+			s->sequence = SEQ_BLOCK_CHECK;
+
+		case SEQ_BLOCK_CHECK:
+			if (s->check_type == XZ_CHECK_CRC32)
+			{
+				ret = crc_validate(s, b, 32);
+				if (ret != XZ_STREAM_END)
+					return ret;
+			}
+			else if (IS_CRC64(s->check_type))
+			{
+				ret = crc_validate(s, b, 64);
+				if (ret != XZ_STREAM_END)
+					return ret;
+			}
+#ifdef XZ_DEC_ANY_CHECK
+			else if (!check_skip(s, b))
+			{
+				return XZ_OK;
+			}
+#endif
+
+			s->sequence = SEQ_BLOCK_START;
+			break;
+
+		case SEQ_INDEX:
+			ret = dec_index(s, b);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->sequence = SEQ_INDEX_PADDING;
+
+		case SEQ_INDEX_PADDING:
+			while ((s->index.size + (b->in_pos - s->in_start)) & 3)
+			{
+				if (b->in_pos == b->in_size)
+				{
+					index_update(s, b);
+					return XZ_OK;
+				}
+
+				if (b->in[b->in_pos++] != 0)
+					return XZ_DATA_ERROR;
+			}
+
+			/* Finish the CRC32 value and Index size. */
+			index_update(s, b);
+
+			/* Compare the hashes to validate the Index field. */
+			if (!memeq(&s->block.hash, &s->index.hash, sizeof(s->block.hash)))
+				return XZ_DATA_ERROR;
+
+			s->sequence = SEQ_INDEX_CRC32;
+
+		case SEQ_INDEX_CRC32:
+			ret = crc_validate(s, b, 32);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->temp.size = STREAM_HEADER_SIZE;
+			s->sequence = SEQ_STREAM_FOOTER;
+
+		case SEQ_STREAM_FOOTER:
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			return dec_stream_footer(s);
+		}
+	}
+
+	/* Never reached */
+}
+
+/*
+ * xz_dec_run() is a wrapper for dec_main() to handle some special cases in
+ * multi-call and single-call decoding.
+ *
+ * In multi-call mode, we must return XZ_BUF_ERROR when it seems clear that we
+ * are not going to make any progress anymore. This is to prevent the caller
+ * from calling us infinitely when the input file is truncated or otherwise
+ * corrupt. Since zlib-style API allows that the caller fills the input buffer
+ * only when the decoder doesn't produce any new output, we have to be careful
+ * to avoid returning XZ_BUF_ERROR too easily: XZ_BUF_ERROR is returned only
+ * after the second consecutive call to xz_dec_run() that makes no progress.
+ *
+ * In single-call mode, if we couldn't decode everything and no error
+ * occurred, either the input is truncated or the output buffer is too small.
+ * Since we know that the last input byte never produces any output, we know
+ * that if all the input was consumed and decoding wasn't finished, the file
+ * must be corrupt. Otherwise the output buffer has to be too small or the
+ * file is corrupt in a way that decoding it produces too big output.
+ *
+ * If single-call decoding fails, we reset b->in_pos and b->out_pos back to
+ * their original values. This is because with some filter chains there won't
+ * be any valid uncompressed data in the output buffer unless the decoding
+ * actually succeeds (that's the price to pay of using the output buffer as
+ * the workspace).
+ */
+XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b)
+{
+	size_t in_start;
+	size_t out_start;
+	enum xz_ret ret;
+
+	if (DEC_IS_SINGLE(s->mode))
+		xz_dec_reset(s);
+
+	in_start = b->in_pos;
+	out_start = b->out_pos;
+	ret = dec_main(s, b);
+
+	if (DEC_IS_SINGLE(s->mode))
+	{
+		if (ret == XZ_OK)
+			ret = b->in_pos == b->in_size ? XZ_DATA_ERROR : XZ_BUF_ERROR;
+
+		if (ret != XZ_STREAM_END)
+		{
+			b->in_pos = in_start;
+			b->out_pos = out_start;
+		}
+	}
+	else if (ret == XZ_OK && in_start == b->in_pos && out_start == b->out_pos)
+	{
+		if (s->allow_buf_error)
+			ret = XZ_BUF_ERROR;
+
+		s->allow_buf_error = true;
+	}
+	else
+	{
+		s->allow_buf_error = false;
+	}
+
+	return ret;
+}
+
+XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max)
+{
+	struct xz_dec *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s == NULL)
+		return NULL;
+
+	s->mode = mode;
+
+#ifdef XZ_DEC_BCJ
+	s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));
+	if (s->bcj == NULL)
+		goto error_bcj;
+#endif
+
+	s->lzma2 = xz_dec_lzma2_create(mode, dict_max);
+	if (s->lzma2 == NULL)
+		goto error_lzma2;
+
+	xz_dec_reset(s);
+	return s;
+
+error_lzma2:
+#ifdef XZ_DEC_BCJ
+	xz_dec_bcj_end(s->bcj);
+error_bcj:
+#endif
+	kfree(s);
+	return NULL;
+}
+
+XZ_EXTERN void xz_dec_reset(struct xz_dec *s)
+{
+	s->sequence = SEQ_STREAM_HEADER;
+	s->allow_buf_error = false;
+	s->pos = 0;
+	s->crc = 0;
+	memzero(&s->block, sizeof(s->block));
+	memzero(&s->index, sizeof(s->index));
+	s->temp.pos = 0;
+	s->temp.size = STREAM_HEADER_SIZE;
+}
+
+XZ_EXTERN void xz_dec_end(struct xz_dec *s)
+{
+	if (s != NULL)
+	{
+		xz_dec_lzma2_end(s->lzma2);
+#ifdef XZ_DEC_BCJ
+		xz_dec_bcj_end(s->bcj);
+#endif
+		kfree(s);
+	}
+}
diff --git a/libraries/xz-embedded/src/xz_lzma2.h b/libraries/xz-embedded/src/xz_lzma2.h
new file mode 100644
index 00000000..3976033a
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_lzma2.h
@@ -0,0 +1,204 @@
+/*
+ * LZMA2 definitions
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#ifndef XZ_LZMA2_H
+#define XZ_LZMA2_H
+
+/* Range coder constants */
+#define RC_SHIFT_BITS 8
+#define RC_TOP_BITS 24
+#define RC_TOP_VALUE (1 << RC_TOP_BITS)
+#define RC_BIT_MODEL_TOTAL_BITS 11
+#define RC_BIT_MODEL_TOTAL (1 << RC_BIT_MODEL_TOTAL_BITS)
+#define RC_MOVE_BITS 5
+
+/*
+ * Maximum number of position states. A position state is the lowest pb
+ * number of bits of the current uncompressed offset. In some places there
+ * are different sets of probabilities for different position states.
+ */
+#define POS_STATES_MAX (1 << 4)
+
+/*
+ * This enum is used to track which LZMA symbols have occurred most recently
+ * and in which order. This information is used to predict the next symbol.
+ *
+ * Symbols:
+ *  - Literal: One 8-bit byte
+ *  - Match: Repeat a chunk of data at some distance
+ *  - Long repeat: Multi-byte match at a recently seen distance
+ *  - Short repeat: One-byte repeat at a recently seen distance
+ *
+ * The symbol names are in from STATE_oldest_older_previous. REP means
+ * either short or long repeated match, and NONLIT means any non-literal.
+ */
+enum lzma_state
+{
+	STATE_LIT_LIT,
+	STATE_MATCH_LIT_LIT,
+	STATE_REP_LIT_LIT,
+	STATE_SHORTREP_LIT_LIT,
+	STATE_MATCH_LIT,
+	STATE_REP_LIT,
+	STATE_SHORTREP_LIT,
+	STATE_LIT_MATCH,
+	STATE_LIT_LONGREP,
+	STATE_LIT_SHORTREP,
+	STATE_NONLIT_MATCH,
+	STATE_NONLIT_REP
+};
+
+/* Total number of states */
+#define STATES 12
+
+/* The lowest 7 states indicate that the previous state was a literal. */
+#define LIT_STATES 7
+
+/* Indicate that the latest symbol was a literal. */
+static inline void lzma_state_literal(enum lzma_state *state)
+{
+	if (*state <= STATE_SHORTREP_LIT_LIT)
+		*state = STATE_LIT_LIT;
+	else if (*state <= STATE_LIT_SHORTREP)
+		*state -= 3;
+	else
+		*state -= 6;
+}
+
+/* Indicate that the latest symbol was a match. */
+static inline void lzma_state_match(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
+}
+
+/* Indicate that the latest state was a long repeated match. */
+static inline void lzma_state_long_rep(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
+}
+
+/* Indicate that the latest symbol was a short match. */
+static inline void lzma_state_short_rep(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
+}
+
+/* Test if the previous symbol was a literal. */
+static inline bool lzma_state_is_literal(enum lzma_state state)
+{
+	return state < LIT_STATES;
+}
+
+/* Each literal coder is divided in three sections:
+ *   - 0x001-0x0FF: Without match byte
+ *   - 0x101-0x1FF: With match byte; match bit is 0
+ *   - 0x201-0x2FF: With match byte; match bit is 1
+ *
+ * Match byte is used when the previous LZMA symbol was something else than
+ * a literal (that is, it was some kind of match).
+ */
+#define LITERAL_CODER_SIZE 0x300
+
+/* Maximum number of literal coders */
+#define LITERAL_CODERS_MAX (1 << 4)
+
+/* Minimum length of a match is two bytes. */
+#define MATCH_LEN_MIN 2
+
+/* Match length is encoded with 4, 5, or 10 bits.
+ *
+ * Length   Bits
+ *  2-9      4 = Choice=0 + 3 bits
+ * 10-17     5 = Choice=1 + Choice2=0 + 3 bits
+ * 18-273   10 = Choice=1 + Choice2=1 + 8 bits
+ */
+#define LEN_LOW_BITS 3
+#define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)
+#define LEN_MID_BITS 3
+#define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)
+#define LEN_HIGH_BITS 8
+#define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)
+#define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)
+
+/*
+ * Maximum length of a match is 273 which is a result of the encoding
+ * described above.
+ */
+#define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)
+
+/*
+ * Different sets of probabilities are used for match distances that have
+ * very short match length: Lengths of 2, 3, and 4 bytes have a separate
+ * set of probabilities for each length. The matches with longer length
+ * use a shared set of probabilities.
+ */
+#define DIST_STATES 4
+
+/*
+ * Get the index of the appropriate probability array for decoding
+ * the distance slot.
+ */
+static inline uint32_t lzma_get_dist_state(uint32_t len)
+{
+	return len < DIST_STATES + MATCH_LEN_MIN ? len - MATCH_LEN_MIN : DIST_STATES - 1;
+}
+
+/*
+ * The highest two bits of a 32-bit match distance are encoded using six bits.
+ * This six-bit value is called a distance slot. This way encoding a 32-bit
+ * value takes 6-36 bits, larger values taking more bits.
+ */
+#define DIST_SLOT_BITS 6
+#define DIST_SLOTS (1 << DIST_SLOT_BITS)
+
+/* Match distances up to 127 are fully encoded using probabilities. Since
+ * the highest two bits (distance slot) are always encoded using six bits,
+ * the distances 0-3 don't need any additional bits to encode, since the
+ * distance slot itself is the same as the actual distance. DIST_MODEL_START
+ * indicates the first distance slot where at least one additional bit is
+ * needed.
+ */
+#define DIST_MODEL_START 4
+
+/*
+ * Match distances greater than 127 are encoded in three pieces:
+ *   - distance slot: the highest two bits
+ *   - direct bits: 2-26 bits below the highest two bits
+ *   - alignment bits: four lowest bits
+ *
+ * Direct bits don't use any probabilities.
+ *
+ * The distance slot value of 14 is for distances 128-191.
+ */
+#define DIST_MODEL_END 14
+
+/* Distance slots that indicate a distance <= 127. */
+#define FULL_DISTANCES_BITS (DIST_MODEL_END / 2)
+#define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)
+
+/*
+ * For match distances greater than 127, only the highest two bits and the
+ * lowest four bits (alignment) is encoded using probabilities.
+ */
+#define ALIGN_BITS 4
+#define ALIGN_SIZE (1 << ALIGN_BITS)
+#define ALIGN_MASK (ALIGN_SIZE - 1)
+
+/* Total number of all probability variables */
+#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX *LITERAL_CODER_SIZE)
+
+/*
+ * LZMA remembers the four most recent match distances. Reusing these
+ * distances tends to take less space than re-encoding the actual
+ * distance value.
+ */
+#define REPS 4
+
+#endif
diff --git a/libraries/xz-embedded/src/xz_private.h b/libraries/xz-embedded/src/xz_private.h
new file mode 100644
index 00000000..55a3af1c
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_private.h
@@ -0,0 +1,150 @@
+/*
+ * Private includes and definitions
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#ifndef XZ_PRIVATE_H
+#define XZ_PRIVATE_H
+
+#ifdef __KERNEL__
+#include <linux/xz.h>
+#include <linux/kernel.h>
+#include <asm/unaligned.h>
+/* XZ_PREBOOT may be defined only via decompress_unxz.c. */
+#ifndef XZ_PREBOOT
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/string.h>
+#ifdef CONFIG_XZ_DEC_X86
+#define XZ_DEC_X86
+#endif
+#ifdef CONFIG_XZ_DEC_POWERPC
+#define XZ_DEC_POWERPC
+#endif
+#ifdef CONFIG_XZ_DEC_IA64
+#define XZ_DEC_IA64
+#endif
+#ifdef CONFIG_XZ_DEC_ARM
+#define XZ_DEC_ARM
+#endif
+#ifdef CONFIG_XZ_DEC_ARMTHUMB
+#define XZ_DEC_ARMTHUMB
+#endif
+#ifdef CONFIG_XZ_DEC_SPARC
+#define XZ_DEC_SPARC
+#endif
+#define memeq(a, b, size) (memcmp(a, b, size) == 0)
+#define memzero(buf, size) memset(buf, 0, size)
+#endif
+#define get_le32(p) le32_to_cpup((const uint32_t *)(p))
+#else
+/*
+ * For userspace builds, use a separate header to define the required
+ * macros and functions. This makes it easier to adapt the code into
+ * different environments and avoids clutter in the Linux kernel tree.
+ */
+#include "xz_config.h"
+#endif
+
+/* If no specific decoding mode is requested, enable support for all modes. */
+#if !defined(XZ_DEC_SINGLE) && !defined(XZ_DEC_PREALLOC) && !defined(XZ_DEC_DYNALLOC)
+#define XZ_DEC_SINGLE
+#define XZ_DEC_PREALLOC
+#define XZ_DEC_DYNALLOC
+#endif
+
+/*
+ * The DEC_IS_foo(mode) macros are used in "if" statements. If only some
+ * of the supported modes are enabled, these macros will evaluate to true or
+ * false at compile time and thus allow the compiler to omit unneeded code.
+ */
+#ifdef XZ_DEC_SINGLE
+#define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)
+#else
+#define DEC_IS_SINGLE(mode) (false)
+#endif
+
+#ifdef XZ_DEC_PREALLOC
+#define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)
+#else
+#define DEC_IS_PREALLOC(mode) (false)
+#endif
+
+#ifdef XZ_DEC_DYNALLOC
+#define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)
+#else
+#define DEC_IS_DYNALLOC(mode) (false)
+#endif
+
+#if !defined(XZ_DEC_SINGLE)
+#define DEC_IS_MULTI(mode) (true)
+#elif defined(XZ_DEC_PREALLOC) || defined(XZ_DEC_DYNALLOC)
+#define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)
+#else
+#define DEC_IS_MULTI(mode) (false)
+#endif
+
+/*
+ * If any of the BCJ filter decoders are wanted, define XZ_DEC_BCJ.
+ * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.
+ */
+#ifndef XZ_DEC_BCJ
+#if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) || defined(XZ_DEC_IA64) ||                  \
+	defined(XZ_DEC_ARM) || defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) ||                  \
+	defined(XZ_DEC_SPARC)
+#define XZ_DEC_BCJ
+#endif
+#endif
+
+/*
+ * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
+ * before calling xz_dec_lzma2_run().
+ */
+XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode, uint32_t dict_max);
+
+/*
+ * Decode the LZMA2 properties (one byte) and reset the decoder. Return
+ * XZ_OK on success, XZ_MEMLIMIT_ERROR if the preallocated dictionary is not
+ * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
+ * decoder doesn't support.
+ */
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props);
+
+/* Decode raw LZMA2 stream from b->in to b->out. */
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b);
+
+/* Free the memory allocated for the LZMA2 decoder. */
+XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);
+
+#ifdef XZ_DEC_BCJ
+/*
+ * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before
+ * calling xz_dec_bcj_run().
+ */
+XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call);
+
+/*
+ * Decode the Filter ID of a BCJ filter. This implementation doesn't
+ * support custom start offsets, so no decoding of Filter Properties
+ * is needed. Returns XZ_OK if the given Filter ID is supported.
+ * Otherwise XZ_OPTIONS_ERROR is returned.
+ */
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);
+
+/*
+ * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
+ * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()
+ * must be called directly.
+ */
+XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s, struct xz_dec_lzma2 *lzma2,
+									 struct xz_buf *b);
+
+/* Free the memory allocated for the BCJ filters. */
+#define xz_dec_bcj_end(s) kfree(s)
+#endif
+
+#endif
diff --git a/libraries/xz-embedded/src/xz_stream.h b/libraries/xz-embedded/src/xz_stream.h
new file mode 100644
index 00000000..c0e191e6
--- /dev/null
+++ b/libraries/xz-embedded/src/xz_stream.h
@@ -0,0 +1,62 @@
+/*
+ * Definitions for handling the .xz file format
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+#ifndef XZ_STREAM_H
+#define XZ_STREAM_H
+
+#if defined(__KERNEL__) && !XZ_INTERNAL_CRC32
+#include <linux/crc32.h>
+#undef crc32
+#define xz_crc32(buf, size, crc) (~crc32_le(~(uint32_t)(crc), buf, size))
+#endif
+
+/*
+ * See the .xz file format specification at
+ * http://tukaani.org/xz/xz-file-format.txt
+ * to understand the container format.
+ */
+
+#define STREAM_HEADER_SIZE 12
+
+#define HEADER_MAGIC "\3757zXZ"
+#define HEADER_MAGIC_SIZE 6
+
+#define FOOTER_MAGIC "YZ"
+#define FOOTER_MAGIC_SIZE 2
+
+/*
+ * Variable-length integer can hold a 63-bit unsigned integer or a special
+ * value indicating that the value is unknown.
+ *
+ * Experimental: vli_type can be defined to uint32_t to save a few bytes
+ * in code size (no effect on speed). Doing so limits the uncompressed and
+ * compressed size of the file to less than 256 MiB and may also weaken
+ * error detection slightly.
+ */
+typedef uint64_t vli_type;
+
+#define VLI_MAX ((vli_type) - 1 / 2)
+#define VLI_UNKNOWN ((vli_type) - 1)
+
+/* Maximum encoded size of a VLI */
+#define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)
+
+/* Integrity Check types */
+enum xz_check
+{
+	XZ_CHECK_NONE = 0,
+	XZ_CHECK_CRC32 = 1,
+	XZ_CHECK_CRC64 = 4,
+	XZ_CHECK_SHA256 = 10
+};
+
+/* Maximum possible Check ID */
+#define XZ_CHECK_MAX 15
+
+#endif
diff --git a/libraries/xz-embedded/xzminidec.c b/libraries/xz-embedded/xzminidec.c
new file mode 100644
index 00000000..bb62c3ac
--- /dev/null
+++ b/libraries/xz-embedded/xzminidec.c
@@ -0,0 +1,144 @@
+/*
+ * Simple XZ decoder command line tool
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+/*
+ * This is really limited: Not all filters from .xz format are supported,
+ * only CRC32 is supported as the integrity check, and decoding of
+ * concatenated .xz streams is not supported. Thus, you may want to look
+ * at xzdec from XZ Utils if a few KiB bigger tool is not a problem.
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include "xz.h"
+
+static uint8_t in[BUFSIZ];
+static uint8_t out[BUFSIZ];
+
+int main(int argc, char **argv)
+{
+	struct xz_buf b;
+	struct xz_dec *s;
+	enum xz_ret ret;
+	const char *msg;
+
+	if (argc >= 2 && strcmp(argv[1], "--help") == 0)
+	{
+		fputs("Uncompress a .xz file from stdin to stdout.\n"
+			  "Arguments other than `--help' are ignored.\n",
+			  stdout);
+		return 0;
+	}
+
+	xz_crc32_init();
+#ifdef XZ_USE_CRC64
+	xz_crc64_init();
+#endif
+
+	/*
+	 * Support up to 64 MiB dictionary. The actually needed memory
+	 * is allocated once the headers have been parsed.
+	 */
+	s = xz_dec_init(XZ_DYNALLOC, 1 << 26);
+	if (s == NULL)
+	{
+		msg = "Memory allocation failed\n";
+		goto error;
+	}
+
+	b.in = in;
+	b.in_pos = 0;
+	b.in_size = 0;
+	b.out = out;
+	b.out_pos = 0;
+	b.out_size = BUFSIZ;
+
+	while (true)
+	{
+		if (b.in_pos == b.in_size)
+		{
+			b.in_size = fread(in, 1, sizeof(in), stdin);
+			b.in_pos = 0;
+		}
+
+		ret = xz_dec_run(s, &b);
+
+		if (b.out_pos == sizeof(out))
+		{
+			if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos)
+			{
+				msg = "Write error\n";
+				goto error;
+			}
+
+			b.out_pos = 0;
+		}
+
+		if (ret == XZ_OK)
+			continue;
+
+#ifdef XZ_DEC_ANY_CHECK
+		if (ret == XZ_UNSUPPORTED_CHECK)
+		{
+			fputs(argv[0], stderr);
+			fputs(": ", stderr);
+			fputs("Unsupported check; not verifying "
+				  "file integrity\n",
+				  stderr);
+			continue;
+		}
+#endif
+
+		if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos || fclose(stdout))
+		{
+			msg = "Write error\n";
+			goto error;
+		}
+
+		switch (ret)
+		{
+		case XZ_STREAM_END:
+			xz_dec_end(s);
+			return 0;
+
+		case XZ_MEM_ERROR:
+			msg = "Memory allocation failed\n";
+			goto error;
+
+		case XZ_MEMLIMIT_ERROR:
+			msg = "Memory usage limit reached\n";
+			goto error;
+
+		case XZ_FORMAT_ERROR:
+			msg = "Not a .xz file\n";
+			goto error;
+
+		case XZ_OPTIONS_ERROR:
+			msg = "Unsupported options in the .xz headers\n";
+			goto error;
+
+		case XZ_DATA_ERROR:
+		case XZ_BUF_ERROR:
+			msg = "File is corrupt\n";
+			goto error;
+
+		default:
+			msg = "Bug!\n";
+			goto error;
+		}
+	}
+
+error:
+	xz_dec_end(s);
+	fputs(argv[0], stderr);
+	fputs(": ", stderr);
+	fputs(msg, stderr);
+	return 1;
+}