26 files changed, 66 insertions, 56 deletions
diff --git a/.dockerignore b/.dockerignore
index 8d51d4f489..42716b7249 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
 .git/
 
 caches/
+.idea/
 __pycache__/
 public/
 
diff --git a/.gitignore b/.gitignore
index d1af514d0d..63fb57b6cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ public/*/
 
 caches/
 !caches/*/.keep
+.idea/
 __pycache__
 config_local.sh
 polymc
diff --git a/enumerateForge.py b/enumerateForge.py
index 06c55401ee..a6287d47f2 100755
--- a/enumerateForge.py
+++ b/enumerateForge.py
@@ -3,7 +3,7 @@ from enum import Enum
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-from metautil import *
+from meta.metautil import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 
diff --git a/generateFabric.py b/generateFabric.py
index 8dd292da72..2f897a5b8c 100755
--- a/generateFabric.py
+++ b/generateFabric.py
@@ -1,7 +1,11 @@
-from fabricutil import *
+from meta.fabricutil import *
+from meta.common import ensure_component_dir, polymc_path, upstream_path
 
-PMC_DIR = os.environ["PMC_DIR"]
-UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
+PMC_DIR = polymc_path()
+UPSTREAM_DIR = upstream_path()
+
+ensure_component_dir("net.fabricmc.fabric-loader")
+ensure_component_dir("net.fabricmc.intermediary")
 
 # turn loader versions into packages
 loaderRecommended = []
@@ -10,15 +14,6 @@ intermediaryRecommended = []
 intermediaryVersions = []
 
 
-def mkdirs(path):
-    if not os.path.exists(path):
-        os.makedirs(path)
-
-
-mkdirs(PMC_DIR + "/net.fabricmc.fabric-loader")
-mkdirs(PMC_DIR + "/net.fabricmc.intermediary")
-
-
 def loadJarInfo(mavenKey):
     with open(UPSTREAM_DIR + "/fabric/jars/" + mavenKey.replace(":", ".") + ".json", 'r',
               encoding='utf-8') as jarInfoFile:
diff --git a/generateForge.py b/generateForge.py
index 052171179b..222233023c 100755
--- a/generateForge.py
+++ b/generateForge.py
@@ -2,21 +2,18 @@ import re
 import sys
 from distutils.version import LooseVersion
 
-from forgeutil import *
-from metautil import *
+from meta.forgeutil import *
+from meta.metautil import *
+from meta.common import ensure_component_dir, polymc_path, upstream_path
 
-PMC_DIR = os.environ["PMC_DIR"]
-UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
+PMC_DIR = polymc_path()
+UPSTREAM_DIR = upstream_path()
 
-def mkdirs(path):
-    if not os.path.exists(path):
-        os.makedirs(path)
-
-
-mkdirs(PMC_DIR + "/net.minecraftforge")
+ensure_component_dir("net.minecraftforge")
 
 FORGEWRAPPER_MAVEN = "https://polymc.github.io/files/maven/%s"
 
+
 def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
diff --git a/generateLiteloader.py b/generateLiteloader.py
index 8b6414ac57..63ffc2e1bd 100755
--- a/generateLiteloader.py
+++ b/generateLiteloader.py
@@ -1,15 +1,12 @@
-from liteloaderutil import *
+from meta.liteloaderutil import *
+from meta.common import ensure_component_dir, polymc_path, upstream_path
 
-PMC_DIR = os.environ["PMC_DIR"]
-UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
+PMC_DIR = polymc_path()
+UPSTREAM_DIR = upstream_path()
 
-def mkdirs(path):
-    if not os.path.exists(path):
-        os.makedirs(path)
+ensure_component_dir("com.mumfrey.liteloader")
 
 
-mkdirs(PMC_DIR + "/com.mumfrey.liteloader")
-
 # load the locally cached version list
 def loadLiteloaderJson():
     with open(UPSTREAM_DIR + "/liteloader/versions.json", 'r', encoding='utf-8') as f:
diff --git a/generateMojang.py b/generateMojang.py
index 2b8a417a6f..dd3b712cd7 100755
--- a/generateMojang.py
+++ b/generateMojang.py
@@ -4,20 +4,17 @@ from collections import defaultdict, namedtuple
 from operator import itemgetter
 from pprint import pprint
 
-from metautil import *
+from meta.metautil import *
+from meta.common import ensure_component_dir, polymc_path, upstream_path
 
-PMC_DIR = os.environ["PMC_DIR"]
-UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
+PMC_DIR = polymc_path()
+UPSTREAM_DIR = upstream_path()
 
-def mkdirs(path):
-    if not os.path.exists(path):
-        os.makedirs(path)
+ensure_component_dir("net.minecraft")
+ensure_component_dir("org.lwjgl")
+ensure_component_dir("org.lwjgl")
 
 
-mkdirs(PMC_DIR + "/net.minecraft")
-mkdirs(PMC_DIR + "/org.lwjgl")
-mkdirs(PMC_DIR + "/org.lwjgl3")
-
 def map_log4j_artifact(version):
     if version == "2.0-beta9":
         return ("2.0-beta9-fixed", "https://polymc.github.io/files/maven/%s")
@@ -372,7 +369,7 @@ for lwjglVersionVariant in lwjglVersionVariants:
         processSingleVariant(decidedVariant.version)
     else:
         raise Exception("No variant decided for version %s out of %d possible ones and %d unknown ones." % (
-        lwjglVersionVariant, passedVariants, unknownVariants))
+            lwjglVersionVariant, passedVariants, unknownVariants))
 
 lwjglSharedData = PolyMCSharedPackageData(uid='org.lwjgl', name='LWJGL 2')
 lwjglSharedData.recommended = ['2.9.4-nightly-20150209']
diff --git a/index.py b/index.py
index 6561a49f40..ee19a477ca 100755
--- a/index.py
+++ b/index.py
@@ -1,7 +1,7 @@
 import hashlib
 from operator import itemgetter
 
-from metautil import *
+from meta.metautil import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 
diff --git a/meta/__init__.py b/meta/__init__.py
new file mode 100644
index 0000000000..05cee3e7d7
--- /dev/null
+++ b/meta/__init__.py
@@ -0,0 +1 @@
+"""Meta package of meta"""
diff --git a/meta/common.py b/meta/common.py
new file mode 100644
index 0000000000..5454f517f3
--- /dev/null
+++ b/meta/common.py
@@ -0,0 +1,19 @@
+import os
+
+
+def polymc_path():
+    if "PMC_DIR" in os.environ:
+        return os.environ["PMC_DIR"]
+    return "polymc"
+
+
+def upstream_path():
+    if "UPSTREAM_DIR" in os.environ:
+        return os.environ["UPSTREAM_DIR"]
+    return "upstream"
+
+
+def ensure_component_dir(component_id):
+    path = os.path.join(polymc_path(), component_id)
+    if not os.path.exists(path):
+        os.makedirs(path)
diff --git a/fabricutil.py b/meta/fabricutil.py
index 6a959001d6..2f38f8f051 100644
--- a/fabricutil.py
+++ b/meta/fabricutil.py
@@ -1,5 +1,4 @@
-import jsonobject
-from metautil import *
+from .metautil import *
 
 
 class FabricInstallerArguments(JsonObject):
@@ -21,7 +20,7 @@ class FabricInstallerLibraries(JsonObject):
 class FabricInstallerDataV1(JsonObject):
     version = IntegerProperty(required=True)
     libraries = ObjectProperty(FabricInstallerLibraries, required=True)
-    mainClass = jsonobject.DefaultProperty()
+    mainClass = DefaultProperty()
     arguments = ObjectProperty(FabricInstallerArguments, required=False)
     launchwrapper = ObjectProperty(FabricInstallerLaunchwrapper, required=False)
 
diff --git a/forgeutil.py b/meta/forgeutil.py
index 3c990e58bc..4c2615cb8d 100644
--- a/forgeutil.py
+++ b/meta/forgeutil.py
@@ -1,6 +1,6 @@
 from collections import namedtuple
 
-from metautil import *
+from .metautil import *
 
 
 # A post-processed entry constructed from the reconstructed Forge version index
diff --git a/jsonobject/__init__.py b/meta/jsonobject/__init__.py
index b23fcde73c..83f41913c4 100644
--- a/jsonobject/__init__.py
+++ b/meta/jsonobject/__init__.py
@@ -1,3 +1,5 @@
+# TODO: maybe move to pydantic in the future?
+
 from __future__ import absolute_import
 from .base import JsonObjectMeta
 from .containers import JsonArray
@@ -10,5 +12,6 @@ __all__ = [
     'StringProperty', 'BooleanProperty',
     'DateProperty', 'DateTimeProperty', 'TimeProperty',
     'ObjectProperty', 'ListProperty', 'DictProperty', 'SetProperty',
-    'JsonObject', 'JsonArray', 'AbstractDateProperty', 'JsonProperty'
+    'JsonObject', 'JsonArray', 'AbstractDateProperty', 'JsonProperty',
+    'DefaultProperty'
 ]
diff --git a/jsonobject/api.py b/meta/jsonobject/api.py
index 8b9c4767c1..8b9c4767c1 100644
--- a/jsonobject/api.py
+++ b/meta/jsonobject/api.py
diff --git a/jsonobject/base.py b/meta/jsonobject/base.py
index 90a5f44c6a..90a5f44c6a 100644
--- a/jsonobject/base.py
+++ b/meta/jsonobject/base.py
diff --git a/jsonobject/base_properties.py b/meta/jsonobject/base_properties.py
index 72b0ed72f8..b43b1d44e2 100644
--- a/jsonobject/base_properties.py
+++ b/meta/jsonobject/base_properties.py
@@ -137,7 +137,7 @@ class JsonContainerProperty(JsonProperty):
             self.item_type
 
     def set_item_type(self, item_type):
-        from jsonobject.base import JsonObjectMeta
+        from meta.jsonobject.base import JsonObjectMeta
         if hasattr(item_type, '_type'):
             item_type = item_type._type
         if isinstance(item_type, tuple):
diff --git a/jsonobject/containers.py b/meta/jsonobject/containers.py
index 1150ab9d23..1150ab9d23 100644
--- a/jsonobject/containers.py
+++ b/meta/jsonobject/containers.py
diff --git a/jsonobject/exceptions.py b/meta/jsonobject/exceptions.py
index a42022e120..a42022e120 100644
--- a/jsonobject/exceptions.py
+++ b/meta/jsonobject/exceptions.py
diff --git a/jsonobject/properties.py b/meta/jsonobject/properties.py
index 05bba86da9..05bba86da9 100644
--- a/jsonobject/properties.py
+++ b/meta/jsonobject/properties.py
diff --git a/jsonobject/utils.py b/meta/jsonobject/utils.py
index 9ee8569801..9ee8569801 100644
--- a/jsonobject/utils.py
+++ b/meta/jsonobject/utils.py
diff --git a/liteloaderutil.py b/meta/liteloaderutil.py
index 2e86e8aed8..dce6cb19d4 100644
--- a/liteloaderutil.py
+++ b/meta/liteloaderutil.py
@@ -1,4 +1,4 @@
-from metautil import *
+from .metautil import *
 
 '''
     "repo":{
diff --git a/metautil.py b/meta/metautil.py
index 95fa4a7590..e417bd6e65 100644
--- a/metautil.py
+++ b/meta/metautil.py
@@ -3,7 +3,7 @@ import json
 import os
 
 import iso8601
-from jsonobject import *
+from .jsonobject import *
 
 PMC_DIR = os.environ["PMC_DIR"]
 
diff --git a/updateFabric.py b/updateFabric.py
index a46dfc7e26..57e6bee77c 100755
--- a/updateFabric.py
+++ b/updateFabric.py
@@ -4,7 +4,7 @@ import zipfile
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-from fabricutil import *
+from meta.fabricutil import *
 
 DATETIME_FORMAT_HTTP = "%a, %d %b %Y %H:%M:%S %Z"
 
diff --git a/updateForge.py b/updateForge.py
index 9e82de7b78..a2cc8e9a5d 100755
--- a/updateForge.py
+++ b/updateForge.py
@@ -13,8 +13,8 @@ from pprint import pprint
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-from forgeutil import *
-from metautil import *
+from meta.forgeutil import *
+from meta.metautil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 
diff --git a/updateLiteloader.py b/updateLiteloader.py
index e610eca664..2add518446 100755
--- a/updateLiteloader.py
+++ b/updateLiteloader.py
@@ -7,7 +7,7 @@ import sys
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-from liteloaderutil import *
+from meta.liteloaderutil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]
 
diff --git a/updateMojang.py b/updateMojang.py
index 7aca856710..9f106d735a 100755
--- a/updateMojang.py
+++ b/updateMojang.py
@@ -1,7 +1,7 @@
 import requests
 from cachecontrol import CacheControl
 from cachecontrol.caches import FileCache
-from metautil import *
+from meta.metautil import *
 
 UPSTREAM_DIR = os.environ["UPSTREAM_DIR"]