diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8ca00c0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+SAVED_WORLDS
+screens
+logs
+out
+target
+build
+.DS_Store
+TeraMisc.iml
+TeraMisc.ipr
+TeraMisc.iws
+Terasology.iml
+Terasology.ipr
+Terasology.iws
+.idea
+.classpath
+.project
+.settings
+.gradle
+bin
+data/console/consolelog.json
+benchmark-temp
+*~
+
+# Ignore error logs 
+*.log
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..516d490
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,19 @@
+/*
+ * This is a Gradle build file:
+ * - Gradle Homepage: http://gradle.org/
+ * - Gradle Documentation: http://gradle.org/documentation
+ * - View tasks for this project: $ gradlew tasks
+ */
+
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+/* Gradle Wrapper: Uncomment this task, change 'gradleVersion' and run "wrapper".
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.1'
+}
+*/
+
+repositories {
+    mavenCentral()
+}
diff --git a/creatures/dwarf/Dwarf.mtl b/creatures/blockydwarf/Dwarf.mtl
similarity index 100%
rename from creatures/dwarf/Dwarf.mtl
rename to creatures/blockydwarf/Dwarf.mtl
diff --git a/creatures/dwarf/Dwarf.obj b/creatures/blockydwarf/Dwarf.obj
similarity index 100%
rename from creatures/dwarf/Dwarf.obj
rename to creatures/blockydwarf/Dwarf.obj
diff --git a/creatures/dwarf/DwarfSkin.png b/creatures/blockydwarf/DwarfSkin.png
similarity index 100%
rename from creatures/dwarf/DwarfSkin.png
rename to creatures/blockydwarf/DwarfSkin.png
diff --git a/creatures/dwarf/info.txt b/creatures/blockydwarf/info.txt
similarity index 89%
rename from creatures/dwarf/info.txt
rename to creatures/blockydwarf/info.txt
index 02cf3f5..f94b1e2 100644
--- a/creatures/dwarf/info.txt
+++ b/creatures/blockydwarf/info.txt
@@ -1,8 +1,8 @@
-{
-    "author" : "A'nW",
-    "id" : "dwarf",
-    "status" : "pending animation",
-    "model" : "Dwarf.obj",
-    "texture" : "DwarfSkin.png"
-    "attribution" : "http://forum.movingblocks.net/threads/models-concept-art-creature-system.198/#post-1479"
+{
+    "author" : "A'nW",
+    "id" : "blockydwarf",
+    "status" : "pending animation",
+    "model" : "Dwarf.obj",
+    "texture" : "DwarfSkin.png"
+    "attribution" : "http://forum.movingblocks.net/threads/models-concept-art-creature-system.198/#post-1479"
 }
\ No newline at end of file
diff --git a/creatures/deer/Ears,Snout.png b/creatures/deer/EarsSnout.png
similarity index 100%
rename from creatures/deer/Ears,Snout.png
rename to creatures/deer/EarsSnout.png
diff --git a/creatures/deer/Fur....png b/creatures/deer/Fur.png
similarity index 100%
rename from creatures/deer/Fur....png
rename to creatures/deer/Fur.png
diff --git a/creatures/pony/info.txt b/creatures/pony/info.txt
index 0143fba..976f7df 100644
--- a/creatures/pony/info.txt
+++ b/creatures/pony/info.txt
@@ -1,7 +1,7 @@
 {
     "author" : "basilix,glasz",
     "id" : "pony",
-    "status" : "complete",
+    "status" : "complete, obj re-exported with normals by Josh, pending check-in",
     "model" : "pony_tex.obj",
     "texture" : "pony_layout_tex01.png",
     "attribution" : "http://forum.movingblocks.net/threads/sir-lady-do-you-have-a-model-for-me.470/#post-4916, http://forum.movingblocks.net/threads/animals.394/page-7#post-4424"
diff --git a/creatures/werewolf/info.txt b/creatures/werewolf/info.txt
index d74a4d0..96018e4 100644
--- a/creatures/werewolf/info.txt
+++ b/creatures/werewolf/info.txt
@@ -1,7 +1,7 @@
 {
-    "author" : "Double_A",
+    "author" : "Nym Traveel",
     "id" : "werewolf",
     "status" : "pending texture-animation",
     "model" : "Werewolf.obj",
-    "attribution" : "http://forum.movingblocks.net/threads/animals.394/page-6#post-4319"
+    "attribution" : "http://forum.movingblocks.net/threads/sir-lady-do-you-have-a-model-for-me.470/#post-4934,http://p3d.in/oe1mf"
 }
\ No newline at end of file
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..e61422d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/bin/bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/"
+APP_HOME="`pwd -P`"
+cd "$SAVED"
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/items/Bowling Pin/Bowling Pin.blend b/items/BowlingPin/BowlingPin.blend
similarity index 100%
rename from items/Bowling Pin/Bowling Pin.blend
rename to items/BowlingPin/BowlingPin.blend
diff --git a/items/Bowling Pin/Bowling Pin.mtl b/items/BowlingPin/BowlingPin.mtl
similarity index 100%
rename from items/Bowling Pin/Bowling Pin.mtl
rename to items/BowlingPin/BowlingPin.mtl
diff --git a/items/Bowling Pin/Bowling Pin.obj b/items/BowlingPin/BowlingPin.obj
similarity index 100%
rename from items/Bowling Pin/Bowling Pin.obj
rename to items/BowlingPin/BowlingPin.obj
diff --git a/items/Bowling Pin/Bowling_Pin.png b/items/BowlingPin/BowlingPin.png
similarity index 100%
rename from items/Bowling Pin/Bowling_Pin.png
rename to items/BowlingPin/BowlingPin.png