diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1ee46c8..10dad11 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,6 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,5 +15,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 39c0cac..b3cc2c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,9 @@
 buildscript {
     repositories {
         mavenCentral()
+        flatDir {
+                dirs 'lib' //this way we can find the .aar file in libs folder
+            }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.2.2'
@@ -8,6 +11,8 @@ buildscript {
 }
 apply plugin: 'com.android.application'
 
+
+
 dependencies {
     compile fileTree(dir: 'lib', include: '*.jar')
 }
diff --git a/iARoC-2015.iml b/iARoC-2015.iml
index 5eb2996..90be63e 100644
--- a/iARoC-2015.iml
+++ b/iARoC-2015.iml
@@ -12,8 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
@@ -76,11 +77,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="ioioirobot" level="project" />
     <orderEntry type="library" exported="" name="ioiolibandroid" level="project" />
+    <orderEntry type="library" exported="" name="ioioirobot" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/lib/ioioirobot.jar b/lib/ioioirobot.jar
index da184c1..330a159 100644
Binary files a/lib/ioioirobot.jar and b/lib/ioioirobot.jar differ
diff --git a/src/org/jointheleague/iaroc/Brain.java b/src/org/jointheleague/iaroc/Brain.java
index 001c9cc..621aa85 100644
--- a/src/org/jointheleague/iaroc/Brain.java
+++ b/src/org/jointheleague/iaroc/Brain.java
@@ -2,8 +2,8 @@
 
 import ioio.lib.api.IOIO;
 import ioio.lib.api.exception.ConnectionLostException;
-import org.wintrisstech.irobot.ioio.IRobotCreateAdapter;
-import org.wintrisstech.irobot.ioio.IRobotCreateInterface;
+import org.jointheleague.erik.irobot.IRobotCreateAdapter;
+import org.jointheleague.erik.irobot.IRobotCreateInterface;
 import org.jointheleague.iaroc.sensors.UltraSonicSensors;
 
 public class Brain extends IRobotCreateAdapter {
diff --git a/src/org/jointheleague/iaroc/Dashboard.java b/src/org/jointheleague/iaroc/Dashboard.java
index 4a5af69..34baf3c 100644
--- a/src/org/jointheleague/iaroc/Dashboard.java
+++ b/src/org/jointheleague/iaroc/Dashboard.java
@@ -12,8 +12,8 @@
 
 import java.util.Locale;
 
-import org.wintrisstech.irobot.ioio.IRobotCreateInterface;
-import org.wintrisstech.irobot.ioio.SimpleIRobotCreate;
+import org.jointheleague.erik.irobot.IRobotCreateInterface;
+import org.jointheleague.erik.irobot.SimpleIRobotCreate;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;