diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml
new file mode 100644
index 00000000..dd5c80e7
--- /dev/null
+++ b/.github/workflows/build-samples.yml
@@ -0,0 +1,91 @@
+# Builds the sample projects on multiple targets to check for compiler errors.
+
+name: Build Samples
+
+on:
+  #push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        target: [cpp, html5, hl]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6.0.2
+
+      - name: Setup Haxe
+        uses: FunkinCrew/ci-haxe@v3
+        with:
+          haxe-version: 4.3.7
+
+      - name: Setup hmm.json for Samples
+        working-directory: ./samples
+        run: haxe run.hxml
+
+      - name: Cache Haxelibs
+        uses: actions/cache@v6
+        with:
+          path: ./samples/.haxelib
+          key: haxelib-${{ hashFiles('samples/hmm.json') }}
+          enableCrossOsArchive: true
+          restore-keys: |
+            haxelib-
+
+      - name: Setup HMM
+        run: |
+          haxelib --global --quiet --never update haxelib
+          haxelib --global fixrepo
+          haxelib --global --quiet install hmm
+          haxelib --global run hmm setup
+
+      - name: Install sample dependencies
+        working-directory: ./samples
+        run: |
+          hmm install --quiet
+          haxelib fixrepo
+
+      - name: Build Flixel Sample
+        working-directory: ./samples/flixel
+        run: haxelib run lime build ${{ matrix.target }} --no-output
+
+      - name: Build ZIP Flixel Sample
+        working-directory: ./samples/flixel_zip
+        run: haxelib run lime build ${{ matrix.target }} --no-output
+
+      - name: Build Heaps Sample
+        if: matrix.target == 'hl'
+        working-directory: ./samples/heaps
+        run: haxe hl.hxml
+
+      # The NME target seems to be in a pretty unusable state, so we will ignore errors for now.
+      - name: Build NME Sample
+        continue-on-error: true
+        if: matrix.target != 'hl' && matrix.target != 'html5'
+        working-directory: ./samples/nme
+        run: echo y | haxelib run nme build ${{ matrix.target }} --no-output
+
+      - name: Build OpenFL Sample
+        working-directory: ./samples/openfl
+        run: haxelib run openfl build ${{ matrix.target }} --no-output
+
+      - name: Build OpenFL (Firetongue) Sample
+        working-directory: ./samples/openfl_firetongue
+        run: haxelib run openfl build ${{ matrix.target }} --no-output
+
+      - name: Build OpenFL (HScript) Sample
+        working-directory: ./samples/openfl_hscript
+        run: haxelib run openfl build ${{ matrix.target }} --no-output
+
+      - name: Build OpenFL (HScript with Classes) Sample
+        working-directory: ./samples/openfl_hscript_class
+        run: haxelib run openfl build ${{ matrix.target }} --no-output
+
+
diff --git a/include.xml b/include.xml
index ab2c2bfe..f92b7ef1 100644
--- a/include.xml
+++ b/include.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <!-- These values are added to the project XML when you include this library. -->
+  <haxelib name="jsonpath" />
+  <haxelib name="jsonpatch" />
+  <haxelib name="thx.core" />
   <haxelib name="thx.semver" />
 
   <haxeflag name="--macro" value="polymod.hscript._internal.PolymodFinalMacro.locateAllFinals()" />
diff --git a/polymod/Polymod.hx b/polymod/Polymod.hx
index c1ca70a3..8ad5c798 100644
--- a/polymod/Polymod.hx
+++ b/polymod/Polymod.hx
@@ -279,7 +279,6 @@ class Polymod
     params.dirs ??= [];
     params.ignoredFiles ??= [];
 
-    var shouldLoadMods:Bool = params.modIds.length == 0 && params.dirs.length == 0;
     if (params.fileSystemParams == null) params.fileSystemParams = {modRoot: modRoot};
     if (params.fileSystemParams.modRoot == null) params.fileSystemParams.modRoot = modRoot;
     if (params.apiVersionRule == null) params.apiVersionRule = VersionUtil.DEFAULT_VERSION_RULE;
@@ -847,7 +846,7 @@ class Polymod
     #if hscript_typer
     polymod.hscript._internal.PolymodTyperEx.clearAllModules();
     #end
-    polymod.hscript.HScriptable.ScriptRunner.clearScripts();
+    polymod.hscript.ScriptRunner.clearScripts();
   }
 
   static function prepareRegisterScriptedClasses():Void
@@ -965,6 +964,12 @@ class Polymod
       return lime.app.Future.withValue(results);
     });
   }
+  #else
+  public static function registerAllScriptClassesAsync():Array<Bool>
+  {
+    Polymod.error(SCRIPT_PARSE_FAILED, 'Asynchronous script loading is not supported on this platform!');
+    return [];
+  }
   #end
 
   /**
diff --git a/polymod/backends/HEAPSBackend.hx b/polymod/backends/HEAPSBackend.hx
index 854f66a0..2b5b235b 100644
--- a/polymod/backends/HEAPSBackend.hx
+++ b/polymod/backends/HEAPSBackend.hx
@@ -99,6 +99,11 @@ class HEAPSBackend implements IBackend
     throw 'Function not implemented';
   }
 
+  public function listLibraries():Array<String>
+  {
+    throw 'Function not implemented';
+  }
+
   public function getPath(id:String):String
   {
     throw 'Function not implemented';
@@ -229,7 +234,7 @@ class ModFileEntry extends BytesFileEntry
     var dirPath = isDir ? path : Util.uPathPop(fullFilePath);
 
     var itemPaths = [];
-    for (id in p.type.keys())
+    for (id in p.assetTypes.keys())
     {
       if (id.indexOf(dirPath) != 0) continue;
       if (Util.isMergeOrAppend(id)) continue;
@@ -290,16 +295,16 @@ class ModFileEntry extends BytesFileEntry
     return super.getBytes();
   }
 
-  override function readByte():Int
+  override function readBytes(out:Bytes, outPos:Int, pos:Int, len:Int):Int
   {
     initBytes();
-    return super.readByte();
+    return super.readBytes(out, outPos, pos, len);
   }
 
-  override function read(out:Bytes, pos:Int, size:Int)
+  override function readFull(bytes:Bytes, pos:Int, len:Int)
   {
     initBytes();
-    return super.read(out, pos, size);
+    return super.readFull(bytes, pos, len);
   }
 
   override function loadBitmap(onLoaded:LoadedBitmap->Void):Void
diff --git a/polymod/backends/NMEBackend.hx b/polymod/backends/NMEBackend.hx
index d1cf0c8e..8fbe8a2d 100644
--- a/polymod/backends/NMEBackend.hx
+++ b/polymod/backends/NMEBackend.hx
@@ -165,6 +165,11 @@ class NMEBackend implements IBackend
     throw 'Function not implemented';
   }
 
+  public function listLibraries():Array<String>
+  {
+    throw 'Function not implemented';
+  }
+
   public function getPath(id:String):String
   {
     throw 'Function not implemented';
diff --git a/polymod/backends/PolymodAssetLibrary.hx b/polymod/backends/PolymodAssetLibrary.hx
index f728d6de..574c3f0d 100644
--- a/polymod/backends/PolymodAssetLibrary.hx
+++ b/polymod/backends/PolymodAssetLibrary.hx
@@ -347,7 +347,7 @@ class PolymodAssetLibrary
     return (bytes == null) ? null : bytes.getString(0, bytes.length);
   }
 
-  #if openfl
+  #if (openfl && !nme)
   /**
    * Fetch text directly from the file system.
    * Queries for any modded asset replacements, but ignores merging and appending.
@@ -611,6 +611,7 @@ class PolymodAssetLibrary
     return soundFuture;
   }
   #end
+  #end
 
   /**
    * @return A list of asset libraries for this framework.
@@ -619,7 +620,6 @@ class PolymodAssetLibrary
   {
     return backend.listLibraries();
   }
-  #end
 
   /**
    * Get the absolute system file path for a given asset ID.
@@ -1039,7 +1039,7 @@ class PolymodAssetLibrary
         typeLibraries.get('default').push(file);
       }
 
-      #if openfl
+      #if (openfl && !nme)
       if (assetType == FONT)
       {
         var font = Font.fromFile(this.file(file, modDir));
@@ -1103,7 +1103,7 @@ class PolymodAssetLibrary
       assetTypes.set(f, assetType);
       if (!typeLibraries.exists(libraryId)) typeLibraries.set(libraryId, []);
       typeLibraries.get(libraryId).push(f);
-      #if openfl
+      #if (openfl && !nme)
       if (assetType == FONT)
       {
         var font = Font.fromFile(file(f, redirectPath));
diff --git a/polymod/fs/BaseFileSystem.hx b/polymod/fs/BaseFileSystem.hx
index 9a06953d..6736d5aa 100644
--- a/polymod/fs/BaseFileSystem.hx
+++ b/polymod/fs/BaseFileSystem.hx
@@ -104,40 +104,38 @@ abstract class BaseFileSystem implements IFileSystem
 
     return new Future(performWork, true);
   }
-  #end
 
   /**
-   * Get the byte data for a file from a specific mod.
+   * Load the byte data for a file from a specific mod, asynchronously.
    *
    * @param path The path to retrieve byte data from, relative to the asset root.
    * @param modId A specific mod ID to retrieve an asset from.
-   * @return The file bytes, or `null` if it couldn't be fetched.
+   * @return A future which returns the file bytes.
    */
-  public function getFileBytesByModId(path:String, modId:String):Null<Bytes>
+  public function loadFileBytesByModId(path:String, modId:String):Future<Bytes>
   {
-    var modDir:String = scanModDirectoriesForId(modId) ?? return null;
-    var relativeDir:String = Util.pathJoin(modRoot, modDir);
+    var modDir:Null<String> = scanModDirectoriesForId(modId);
+    if (modDir == null) return null;
+    var relativeDir = Util.pathJoin(modRoot, modDir);
 
-    return getFileBytes(Util.pathJoin(relativeDir, path));
+    return loadFileBytes(Util.pathJoin(relativeDir, path));
   }
+  #end
 
-  #if lime
   /**
-   * Load the byte data for a file from a specific mod, asynchronously.
+   * Get the byte data for a file from a specific mod.
    *
    * @param path The path to retrieve byte data from, relative to the asset root.
    * @param modId A specific mod ID to retrieve an asset from.
-   * @return A future which returns the file bytes.
+   * @return The file bytes, or `null` if it couldn't be fetched.
    */
-  public function loadFileBytesByModId(path:String, modId:String):Future<Bytes>
+  public function getFileBytesByModId(path:String, modId:String):Null<Bytes>
   {
-    var modDir:Null<String> = scanModDirectoriesForId(modId);
-    if (modDir == null) return null;
-    var relativeDir = Util.pathJoin(modRoot, modDir);
+    var modDir:String = scanModDirectoriesForId(modId) ?? return null;
+    var relativeDir:String = Util.pathJoin(modRoot, modDir);
 
-    return loadFileBytes(Util.pathJoin(relativeDir, path));
+    return getFileBytes(Util.pathJoin(relativeDir, path));
   }
-  #end
 
   /**
    * Provide a list of valid mods for this file system to load.
@@ -295,7 +293,6 @@ abstract class BaseFileSystem implements IFileSystem
 
   function getModIconPath(modPath:String, ?origin:PolymodErrorOrigin):Null<String>
   {
-    var foundIcon = false;
     for (iconBasePath in PolymodConfig.modIconFile)
     {
       var iconFile = Util.pathJoin(modPath, iconBasePath);
diff --git a/polymod/fs/StubFileSystem.hx b/polymod/fs/StubFileSystem.hx
index e9646b1e..0cbe4432 100644
--- a/polymod/fs/StubFileSystem.hx
+++ b/polymod/fs/StubFileSystem.hx
@@ -6,6 +6,9 @@ import polymod.Polymod.PolymodErrorOrigin;
 import thx.semver.VersionRule;
 import polymod.fs.PolymodFileSystem.IFileSystem;
 import polymod.fs.PolymodFileSystem.PolymodFileSystemParams;
+#if lime
+import lime.app.Future;
+#end
 
 /**
  * This stub file system returns false for all requests.
@@ -16,7 +19,7 @@ import polymod.fs.PolymodFileSystem.PolymodFileSystemParams;
 @SuppressWarnings('checkstyle:FieldDocComment')
 class StubFileSystem implements IFileSystem
 {
-  public final modRoot:String;
+  public final modRoot:String = '';
   public function new(params:PolymodFileSystemParams) {}
 
   public inline function exists(path:String):Bool
@@ -49,15 +52,34 @@ class StubFileSystem implements IFileSystem
     return null;
   }
 
-  public function onLoadMod(id:String):Void {}
-
-  public function onUnloadMod(id:String):Void {}
-
   public inline function getFileBytesByModId(path:String, modId:String):Null<haxe.io.Bytes>
   {
     return null;
   }
 
+  #if lime
+  public inline function loadFileBytes(path:String):Future<haxe.io.Bytes>
+  {
+    return cast Future.withError('Cannot load file bytes from stub file system');
+  }
+
+  /**
+   * Load the byte data for a file from a specific mod, asynchronously.
+   *
+   * @param path The path to retrieve byte data from, relative to the asset root.
+   * @param modId A specific mod ID to retrieve an asset from.
+   * @return A future which returns the file bytes.
+   */
+  public inline function loadFileBytesByModId(path:String, modId:String):Future<haxe.io.Bytes>
+  {
+    return cast Future.withError('Cannot load file bytes from stub file system');
+  }
+  #end
+
+  public function onLoadMod(id:String):Void {}
+
+  public function onUnloadMod(id:String):Void {}
+
   public inline function readDirectoryRecursive(path:String):Array<String>
   {
     return [];
diff --git a/polymod/hscript/HScriptable.hx b/polymod/hscript/HScriptable.hx
index 18e9cb78..0c8f2e06 100644
--- a/polymod/hscript/HScriptable.hx
+++ b/polymod/hscript/HScriptable.hx
@@ -1,9 +1,6 @@
 package polymod.hscript;
 
 import haxe.Json;
-import polymod.hscript._internal.Expr;
-import polymod.Polymod;
-import polymod.util.Util;
 
 /**
  * This interface triggers the execution of a macro on any elements which use the `@:hscript` annotation.
@@ -171,133 +168,3 @@ class HScriptParams
     return Json.stringify(this);
   }
 }
-
-typedef ScriptOutput =
-{
-  /**
-   * The output of the script. Can be any value type.
-   */
-  var script_result:Dynamic;
-
-  /**
-   * The functions and variables created within the scope of the script.
-   */
-  var script_variables:Map<String, Dynamic>;
-}
-
-class ScriptRunner
-{
-  /**
-   * No reason not to make this static! Load a script once instead of 50 times.
-   */
-  private static var scripts:Map<String, Script> = new Map<String, Script>();
-
-  public function new() {}
-
-  public static function clearScripts():Void
-  {
-    scripts.clear();
-  }
-
-  public function load(name:String, assetHandler:Dynamic):Null<Script>
-  {
-    if (assetHandler == null)
-    {
-      Polymod.error(SCRIPT_NO_ASSET_HANDLER, "Class does not import an Assets class for Polymod to fetch scripts with!", SCRIPT_RUNTIME);
-      return null;
-    }
-
-    var scriptPath = scriptPath(name);
-    Polymod.debug('Fetching script "$scriptPath"...');
-    if (!assetHandler.exists(scriptPath))
-    {
-      // Error will only be thrown if hscriptParams.optional == false (the default).
-      Polymod.debug('Note: Script at path "$scriptPath" not found! This may cause problems if it is not optional...');
-      return null;
-    }
-
-    var script = new Script(assetHandler.getText(scriptPath));
-    scripts.set(name, script);
-    Polymod.debug('Script $name loaded successfully.');
-    return script;
-  }
-
-  static inline function scriptPath(pathName:String):String
-  {
-    return Util.pathJoin('${PolymodConfig.scriptLibrary}:${PolymodConfig.rootPath}', '$pathName${PolymodConfig.scriptExt}');
-  }
-
-  public function get(name:String, ?assetHandler:Dynamic = null):Null<Script>
-  {
-    // If the script isn't loaded yet, do that now.
-    if (!scripts.exists(name))
-    {
-      Polymod.debug('Scripted function loaded late (this is fine if the pathname is dynamic).');
-      load(name, assetHandler);
-    }
-
-    var result = scripts.get(name);
-
-    if (result == null)
-    {
-      // An error will only be thrown if hscriptParams.optional == false (the default).
-      return null;
-    }
-
-    return scripts.get(name);
-  }
-
-  public function execute(name:String, ?assetHandler:Dynamic = null):ScriptOutput
-  {
-    var script = get(name, assetHandler);
-    if (script == null)
-    {
-      Polymod.error(SCRIPT_NOT_FOUND, 'Could not load script $name for execution.', SCRIPT_RUNTIME);
-    }
-    return script.execute();
-  }
-}
-
-class Script
-{
-  private static var parser:polymod.hscript._internal.Parser;
-
-  public var program:Expr;
-  public var interp:polymod.hscript._internal.Interp;
-
-  public static function buildParser():polymod.hscript._internal.Parser
-  {
-    return new polymod.hscript._internal.Parser();
-  }
-
-  public static function buildInterp():polymod.hscript._internal.Interp
-  {
-    // Arguments are only needed in a scripted class context.
-    return new polymod.hscript._internal.Interp(null, null);
-  }
-
-  public function new(script:String, ?origin:String = null)
-  {
-    if (parser == null)
-    {
-      parser = buildParser();
-      parser.allowTypes = true;
-    }
-    program = parser.parseString(script, origin);
-    interp = buildInterp();
-  }
-
-  public function set(key:String, value:Dynamic)
-  {
-    interp.variables.set(key, value);
-  }
-
-  public function execute():ScriptOutput
-  {
-    var result:Dynamic = interp.execute(program);
-    return {
-      script_result: result,
-      script_variables: interp.variables,
-    };
-  }
-}
diff --git a/polymod/hscript/ScriptRunner.hx b/polymod/hscript/ScriptRunner.hx
new file mode 100644
index 00000000..711b9446
--- /dev/null
+++ b/polymod/hscript/ScriptRunner.hx
@@ -0,0 +1,137 @@
+package polymod.hscript;
+
+import polymod.Polymod;
+import polymod.hscript._internal.Expr;
+import polymod.hscript._internal.Interp;
+import polymod.hscript._internal.Parser;
+import polymod.util.Util;
+
+class ScriptRunner
+{
+  /**
+   * No reason not to make this static! Load a script once instead of 50 times.
+   */
+  static var scripts:Map<String, Script> = [];
+
+  public function new() {}
+
+  public static function clearScripts():Void
+  {
+    scripts.clear();
+  }
+
+  public function load(name:String, assetHandler:Dynamic):Null<Script>
+  {
+    if (assetHandler == null)
+    {
+      Polymod.error(SCRIPT_NO_ASSET_HANDLER, "Class does not import an Assets class for Polymod to fetch scripts with!", SCRIPT_RUNTIME);
+      return null;
+    }
+
+    var scriptPath = scriptPath(name);
+    Polymod.debug('Fetching script "$scriptPath"...');
+    if (!assetHandler.exists(scriptPath, null))
+    {
+      // Error will only be thrown if hscriptParams.optional == false (the default).
+      Polymod.debug('Note: Script at path "$scriptPath" not found! This may cause problems if it is not optional...');
+      return null;
+    }
+
+    var script = new Script(assetHandler.getText(scriptPath));
+    scripts.set(name, script);
+    Polymod.debug('Script $name loaded successfully.');
+    return script;
+  }
+
+  static inline function scriptPath(pathName:String):String
+  {
+    return Util.pathJoin('${PolymodConfig.scriptLibrary}:${PolymodConfig.rootPath}', '$pathName${PolymodConfig.scriptExt}');
+  }
+
+  public function get(name:String, ?assetHandler:Dynamic):Null<Script>
+  {
+    // If the script isn't loaded yet, do that now.
+    if (!scripts.exists(name))
+    {
+      Polymod.debug('Scripted function loaded late (this is fine if the pathname is dynamic).');
+      load(name, assetHandler);
+    }
+
+    var result = scripts.get(name);
+
+    if (result == null)
+    {
+      // An error will only be thrown if hscriptParams.optional == false (the default).
+      return null;
+    }
+
+    return scripts.get(name);
+  }
+
+  public function execute(name:String, ?assetHandler:Dynamic):ScriptOutput
+  {
+    var script = get(name, assetHandler);
+    if (script == null)
+    {
+      Polymod.error(SCRIPT_NOT_FOUND, 'Could not load script $name for execution.', SCRIPT_RUNTIME);
+    }
+    return script.execute();
+  }
+}
+
+class Script
+{
+  static var parser:Parser;
+
+  public var program:Expr;
+  public var interp:Interp;
+
+  public static function buildParser():Parser
+  {
+    return new polymod.hscript._internal.Parser();
+  }
+
+  public static function buildInterp():Interp
+  {
+    // Arguments are only needed in a scripted class context.
+    return new Interp(null, null);
+  }
+
+  public function new(script:String, ?origin:String)
+  {
+    if (parser == null)
+    {
+      parser = buildParser();
+      parser.allowTypes = true;
+    }
+    program = parser.parseString(script, origin);
+    interp = buildInterp();
+  }
+
+  public function set(key:String, value:Dynamic)
+  {
+    interp.variables.set(key, value);
+  }
+
+  public function execute():ScriptOutput
+  {
+    var result:Dynamic = interp.execute(program);
+    return {
+      script_result: result,
+      script_variables: interp.variables,
+    };
+  }
+}
+
+typedef ScriptOutput =
+{
+  /**
+   * The output of the script. Can be any value type.
+   */
+  var script_result:Dynamic;
+
+  /**
+   * The functions and variables created within the scope of the script.
+   */
+  var script_variables:Map<String, Dynamic>;
+}
diff --git a/polymod/hscript/_internal/HScriptableMacro.hx b/polymod/hscript/_internal/HScriptableMacro.hx
index 0da17234..68ab4fb1 100644
--- a/polymod/hscript/_internal/HScriptableMacro.hx
+++ b/polymod/hscript/_internal/HScriptableMacro.hx
@@ -177,7 +177,7 @@ class HScriptableMacro
                     }
                     else
                     {
-                      polymod.Polymod.debug('The scripted function ' + $v{pathName} + ' could not be found, but that is fine because it is optional.', SCRIPT_RUNTIME);
+                      polymod.Polymod.debug('The scripted function ' + $v{pathName} + ' could not be found, but that is fine because it is optional.');
 
                       // Prevent the script from running but do not prevent the function body from executing.
                       // wasCancelled = true;
@@ -222,7 +222,7 @@ class HScriptableMacro
             // to load this script:
             if (constructor_setup == null)
             {
-              constructor_setup = [macro _polymod_scripts = new polymod.hscript.HScriptable.ScriptRunner()];
+              constructor_setup = [macro _polymod_scripts = new polymod.hscript.ScriptRunner()];
             }
             if (!hscriptDynamicPath)
             {
@@ -244,7 +244,7 @@ class HScriptableMacro
     // Inject _polymod_scripts var
     for (new_field in (macro class Ignore
       {
-        public var _polymod_scripts:polymod.hscript.HScriptable.ScriptRunner;
+        public var _polymod_scripts:polymod.hscript.ScriptRunner;
       }).fields)
       fields.push(new_field);
     // Find constructor, and inject script setup...
diff --git a/polymod/hscript/_internal/Interp.hx b/polymod/hscript/_internal/Interp.hx
index ef5000fb..f625856f 100644
--- a/polymod/hscript/_internal/Interp.hx
+++ b/polymod/hscript/_internal/Interp.hx
@@ -190,6 +190,8 @@ class Interp
 
     // Don't try to resolve classes without a valid import.
     error(EInvalidModule(cl));
+
+    return null;
   }
 
   private var _nextCallObject:Dynamic = null;
diff --git a/polymod/hscript/_internal/PolymodScriptClass.hx b/polymod/hscript/_internal/PolymodScriptClass.hx
index 92037ca3..5c2eb17c 100644
--- a/polymod/hscript/_internal/PolymodScriptClass.hx
+++ b/polymod/hscript/_internal/PolymodScriptClass.hx
@@ -7,7 +7,6 @@ import polymod.hscript._internal.Expr.ClassImport;
 import polymod.hscript._internal.Expr.FieldDecl;
 import polymod.hscript._internal.Expr.FunctionDecl;
 import polymod.hscript._internal.Expr.VarDecl;
-import polymod.hscript._internal.Printer;
 import polymod.util.Util;
 
 using StringTools;
diff --git a/samples/.gitignore b/samples/.gitignore
new file mode 100644
index 00000000..438073da
--- /dev/null
+++ b/samples/.gitignore
@@ -0,0 +1,2 @@
+.haxelib
+hmm.json
diff --git a/samples/flixel/hmm.json b/samples/flixel/hmm.json
index f7fdfc87..3bbc308f 100644
--- a/samples/flixel/hmm.json
+++ b/samples/flixel/hmm.json
@@ -45,7 +45,9 @@
     },
     {
       "name": "thx.semver",
-      "type": "haxelib"
+      "type": "git",
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/flixel_zip/hmm.json b/samples/flixel_zip/hmm.json
index 3cff2bd9..0a7cfb9d 100644
--- a/samples/flixel_zip/hmm.json
+++ b/samples/flixel_zip/hmm.json
@@ -25,6 +25,16 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "lime",
       "type": "haxelib",
@@ -40,10 +50,17 @@
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/heaps/hmm.json b/samples/heaps/hmm.json
index 6d360aaa..ffab65d5 100644
--- a/samples/heaps/hmm.json
+++ b/samples/heaps/hmm.json
@@ -1,5 +1,10 @@
 {
   "dependencies": [
+    {
+      "name": "format",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "heaps",
       "type": "haxelib",
@@ -15,15 +20,32 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "polymod",
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/heaps/res/data/greeting.txt b/samples/heaps/res/data/greeting.txt
new file mode 100644
index 00000000..af5626b4
--- /dev/null
+++ b/samples/heaps/res/data/greeting.txt
@@ -0,0 +1 @@
+Hello, world!
diff --git a/samples/heaps/res/data/objects.json b/samples/heaps/res/data/objects.json
new file mode 100644
index 00000000..c20b7397
--- /dev/null
+++ b/samples/heaps/res/data/objects.json
@@ -0,0 +1,6 @@
+{
+  "object_0": { "value": "moon" },
+  "object_1": { "value": "star" },
+  "object_2": { "value": "sun" },
+  "nested": { "object": { "array": ["a", "b", "c"] } }
+}
diff --git a/samples/heaps/res/data/objects.xml b/samples/heaps/res/data/objects.xml
new file mode 100644
index 00000000..280a9584
--- /dev/null
+++ b/samples/heaps/res/data/objects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data>
+	<object id="0" value="moon" />
+	<object id="1" value="star" />
+	<object id="2" value="sun" />
+</data>
diff --git a/samples/heaps/res/img/a.png b/samples/heaps/res/img/a.png
new file mode 100644
index 00000000..97284217
Binary files /dev/null and b/samples/heaps/res/img/a.png differ
diff --git a/samples/heaps/res/img/b.png b/samples/heaps/res/img/b.png
new file mode 100644
index 00000000..d00c34d2
Binary files /dev/null and b/samples/heaps/res/img/b.png differ
diff --git a/samples/heaps/res/img/c.png b/samples/heaps/res/img/c.png
new file mode 100644
index 00000000..38400d98
Binary files /dev/null and b/samples/heaps/res/img/c.png differ
diff --git a/samples/nme/hmm.json b/samples/nme/hmm.json
index e9dc5449..30dc5000 100644
--- a/samples/nme/hmm.json
+++ b/samples/nme/hmm.json
@@ -10,15 +10,34 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "nme-dev",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "nme-toolkit",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "polymod",
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/samples/openfl/hmm.json b/samples/openfl/hmm.json
index c8efc8b4..cdc316e6 100644
--- a/samples/openfl/hmm.json
+++ b/samples/openfl/hmm.json
@@ -10,6 +10,16 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "lime",
       "type": "haxelib",
@@ -25,10 +35,19 @@
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/samples/openfl_firetongue/hmm.json b/samples/openfl_firetongue/hmm.json
index 2c9b37b9..ce7daf6c 100644
--- a/samples/openfl_firetongue/hmm.json
+++ b/samples/openfl_firetongue/hmm.json
@@ -15,6 +15,16 @@
       "type": "haxelib",
       "version": null
     },
+    {
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
+      "type": "haxelib",
+      "version": null
+    },
     {
       "name": "lime",
       "type": "haxelib",
@@ -30,10 +40,19 @@
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/openfl_hscript/hmm.json b/samples/openfl_hscript/hmm.json
index 0bfaa61d..e1ee973c 100644
--- a/samples/openfl_hscript/hmm.json
+++ b/samples/openfl_hscript/hmm.json
@@ -1,17 +1,22 @@
 {
   "dependencies": [
     {
-      "name": "hscript",
+      "name": "hxcpp",
       "type": "haxelib",
       "version": null
     },
     {
-      "name": "hxcpp",
+      "name": "hxcpp-debug-server",
       "type": "haxelib",
       "version": null
     },
     {
-      "name": "hxcpp-debug-server",
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
       "type": "haxelib",
       "version": null
     },
@@ -30,10 +35,19 @@
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/openfl_hscript/project.xml b/samples/openfl_hscript/project.xml
index f0466268..2404ab36 100644
--- a/samples/openfl_hscript/project.xml
+++ b/samples/openfl_hscript/project.xml
@@ -12,7 +12,6 @@
 	<source path="src" />
 	<haxelib name="openfl" />
 	<haxelib name="polymod" />
-	<haxelib name="hscript" />
 	<haxeflag name="--dce no" />
 	<!-- assets -->
 	<icon path="assets/openfl.svg" />
diff --git a/samples/openfl_hscript_class/hmm.json b/samples/openfl_hscript_class/hmm.json
index 0bfaa61d..e1ee973c 100644
--- a/samples/openfl_hscript_class/hmm.json
+++ b/samples/openfl_hscript_class/hmm.json
@@ -1,17 +1,22 @@
 {
   "dependencies": [
     {
-      "name": "hscript",
+      "name": "hxcpp",
       "type": "haxelib",
       "version": null
     },
     {
-      "name": "hxcpp",
+      "name": "hxcpp-debug-server",
       "type": "haxelib",
       "version": null
     },
     {
-      "name": "hxcpp-debug-server",
+      "name": "jsonpatch",
+      "type": "haxelib",
+      "version": null
+    },
+    {
+      "name": "jsonpath",
       "type": "haxelib",
       "version": null
     },
@@ -30,10 +35,19 @@
       "path": "../..",
       "type": "dev"
     },
+    {
+      "name": "thx.core",
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.core"
+    },
     {
       "name": "thx.semver",
-      "type": "haxelib",
-      "version": null
+      "type": "git",
+      "dir": null,
+      "ref": "master",
+      "url": "https://github.com/fponticelli/thx.semver"
     }
   ]
 }
diff --git a/samples/openfl_hscript_class/project.xml b/samples/openfl_hscript_class/project.xml
index 9dc38ff2..6979e8c6 100644
--- a/samples/openfl_hscript_class/project.xml
+++ b/samples/openfl_hscript_class/project.xml
@@ -11,7 +11,6 @@
 	<!-- classpath, haxe libs -->
 	<source path="src" />
 	<haxelib name="openfl" />
-	<haxelib name="hscript" />
 	<haxelib name="polymod" />
 	<!-- assets -->
 	<assets path="assets/img" rename="img" />
diff --git a/samples/run.hxml b/samples/run.hxml
new file mode 100644
index 00000000..8a04b532
--- /dev/null
+++ b/samples/run.hxml
@@ -0,0 +1,3 @@
+--class-path scripts
+--main SamplesHMMBuilder
+--interp
diff --git a/samples/scripts/SamplesHMMBuilder.hx b/samples/scripts/SamplesHMMBuilder.hx
new file mode 100644
index 00000000..274b5446
--- /dev/null
+++ b/samples/scripts/SamplesHMMBuilder.hx
@@ -0,0 +1,83 @@
+package ;
+
+import haxe.format.JsonPrinter;
+import haxe.format.JsonParser;
+import haxe.Json;
+import sys.io.File;
+import haxe.io.Path;
+import sys.FileSystem;
+
+typedef HMMDependency =
+{
+  name:String,
+  type:String,
+  ?version: String,
+  ?path:String,
+  ?dir:String,
+  ?url:String,
+  ?ref:String,
+}
+
+/**
+ * A simple tool to build a `hmm.json` file for the samples directory,
+ * by scanning for `hmm.json` files in each sample subdirectory and merging
+ * their dependencies into a single `hmm.json` file.
+ */
+class SamplesHMMBuilder
+{
+  /**
+   * A list of sample directories to ignore when scanning for `hmm.json` files.
+   * This is useful if certain samples do not work well with the system.
+   */
+  static final IGNORE_LIST:Array<String> = [];
+
+  public static function main()
+  {
+    var scriptsPath:String = Path.directory(Sys.programPath());
+    var workPath:String = Path.normalize('$scriptsPath/..');
+
+    var searchPaths:Array<String> = FileSystem.readDirectory(workPath);
+    var dependencies:Map<String, HMMDependency> = [];
+
+    for (path in searchPaths)
+    {
+      if (IGNORE_LIST.contains(path)) continue;
+      if (!FileSystem.isDirectory(path)) continue;
+
+      var hmmPath:String = Path.join([path, 'hmm.json']);
+      if (!FileSystem.exists(hmmPath)) continue;
+
+      var hmmContent:String = File.getContent(hmmPath);
+      try
+      {
+        var json:{ dependencies:Array<HMMDependency> } = Json.parse(hmmContent);
+        if (json.dependencies == null) continue;
+
+        for (dependency in json.dependencies)
+        {
+          if (dependencies.exists(dependency.name))
+          {
+            continue;
+          }
+
+          dependencies.set(dependency.name, dependency);
+        }
+      }
+      catch (_) {}
+    }
+
+    var result = { dependencies: [] };
+    for (dependency in dependencies)
+    {
+      if (dependency.name == 'polymod' && dependency.type == 'dev')
+      {
+        // Force correct relative path
+        dependency.path = '..';
+      }
+
+      result.dependencies.push(dependency);
+    }
+
+    File.saveContent(Path.join([workPath, 'hmm.json']), Json.stringify(result, '  '));
+  }
+}