diff --git a/.gitattributes b/.gitattributes
index 3976a21a616..2ad7b7763ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9938,12 +9938,12 @@ src/main/java/net/slightlymagic/braids/util/progress_monitor/package-info.java s
 src/main/java/net/slightlymagic/maxmtg/Predicate.java -text
 src/main/java/net/slightlymagic/maxmtg/PredicateString.java -text
 src/main/java/net/slightlymagic/maxmtg/package-info.java svneol=native#text/plain
-src/main/java/treeProperties/PropertyElement.java svneol=native#text/plain
-src/main/java/treeProperties/PropertyType.java svneol=native#text/plain
-src/main/java/treeProperties/TreeProperties.java svneol=native#text/plain
-src/main/java/treeProperties/package-info.java svneol=native#text/plain
-src/main/java/treeProperties/types/FileType.java svneol=native#text/plain
-src/main/java/treeProperties/types/package-info.java svneol=native#text/plain
+src/main/java/tree/properties/PropertyElement.java svneol=native#text/plain
+src/main/java/tree/properties/PropertyType.java svneol=native#text/plain
+src/main/java/tree/properties/TreeProperties.java svneol=native#text/plain
+src/main/java/tree/properties/package-info.java svneol=native#text/plain
+src/main/java/tree/properties/types/FileType.java svneol=native#text/plain
+src/main/java/tree/properties/types/package-info.java svneol=native#text/plain
 src/site/apt/index.apt -text
 src/test/java/forge/BoosterDraftAITest.java svneol=native#text/plain
 src/test/java/forge/BoosterDraftTest.java svneol=native#text/plain
diff --git a/src/main/java/treeProperties/PropertyElement.java b/src/main/java/tree/properties/PropertyElement.java
similarity index 96%
rename from src/main/java/treeProperties/PropertyElement.java
rename to src/main/java/tree/properties/PropertyElement.java
index ab5762d0629..60cb27f4d3c 100644
--- a/src/main/java/treeProperties/PropertyElement.java
+++ b/src/main/java/tree/properties/PropertyElement.java
@@ -4,7 +4,7 @@
  * Created on 19.08.2009
  */
 
-package treeProperties;
+package tree.properties;
 
 
 /**
diff --git a/src/main/java/treeProperties/PropertyType.java b/src/main/java/tree/properties/PropertyType.java
similarity index 97%
rename from src/main/java/treeProperties/PropertyType.java
rename to src/main/java/tree/properties/PropertyType.java
index d6e344e9b5d..ac2a5f3bff2 100644
--- a/src/main/java/treeProperties/PropertyType.java
+++ b/src/main/java/tree/properties/PropertyType.java
@@ -1,4 +1,4 @@
-package treeProperties;
+package tree.properties;
 
 
 /**
diff --git a/src/main/java/treeProperties/TreeProperties.java b/src/main/java/tree/properties/TreeProperties.java
similarity index 97%
rename from src/main/java/treeProperties/TreeProperties.java
rename to src/main/java/tree/properties/TreeProperties.java
index 8a27398407b..66979ca4bd2 100644
--- a/src/main/java/treeProperties/TreeProperties.java
+++ b/src/main/java/tree/properties/TreeProperties.java
@@ -1,4 +1,4 @@
-package treeProperties;
+package tree.properties;
 
 
 /**
@@ -8,15 +8,26 @@ package treeProperties;
  */
 
 
-import treeProperties.types.FileType;
-
-import java.io.*;
-import java.util.*;
-import java.util.Map.Entry;
-
 import static java.lang.String.format;
 import static java.util.Collections.unmodifiableList;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.Set;
+
+import tree.properties.types.FileType;
+
 
 /**
  * The class TreeProperties. This class allows for a tree-like structure of properties-files. This class lays some
diff --git a/src/main/java/tree/properties/package-info.java b/src/main/java/tree/properties/package-info.java
new file mode 100644
index 00000000000..f3b15e72e4a
--- /dev/null
+++ b/src/main/java/tree/properties/package-info.java
@@ -0,0 +1,2 @@
+/** Forge Card Game. */
+package tree.properties;
diff --git a/src/main/java/treeProperties/types/FileType.java b/src/main/java/tree/properties/types/FileType.java
similarity index 95%
rename from src/main/java/treeProperties/types/FileType.java
rename to src/main/java/tree/properties/types/FileType.java
index cab4e719eb5..43be5105ae8 100644
--- a/src/main/java/treeProperties/types/FileType.java
+++ b/src/main/java/tree/properties/types/FileType.java
@@ -4,11 +4,11 @@
  * Created on 19.08.2009
  */
 
-package treeProperties.types;
+package tree.properties.types;
 
 
-import treeProperties.PropertyType;
-import treeProperties.TreeProperties;
+import tree.properties.PropertyType;
+import tree.properties.TreeProperties;
 
 import java.io.File;
 import java.util.regex.Matcher;
diff --git a/src/main/java/tree/properties/types/package-info.java b/src/main/java/tree/properties/types/package-info.java
new file mode 100644
index 00000000000..a72843489d1
--- /dev/null
+++ b/src/main/java/tree/properties/types/package-info.java
@@ -0,0 +1,2 @@
+/** Forge Card Game. */
+package tree.properties.types;
diff --git a/src/main/java/treeProperties/package-info.java b/src/main/java/treeProperties/package-info.java
deleted file mode 100644
index 5206789899a..00000000000
--- a/src/main/java/treeProperties/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Forge Card Game */
-package treeProperties;
diff --git a/src/main/java/treeProperties/types/package-info.java b/src/main/java/treeProperties/types/package-info.java
deleted file mode 100644
index 5394130ec3e..00000000000
--- a/src/main/java/treeProperties/types/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Forge Card Game */
-package treeProperties.types;