diff --git a/dwenguino/Dwenguino/libraries/Dwenguino/examples/LabviewLinxInterface/LabviewLinxInterface.ino b/dwenguino/Dwenguino/libraries/Dwenguino/examples/LabviewLinxInterface/LabviewLinxInterface.ino
index fde902d..d744b63 100644
--- a/dwenguino/Dwenguino/libraries/Dwenguino/examples/LabviewLinxInterface/LabviewLinxInterface.ino
+++ b/dwenguino/Dwenguino/libraries/Dwenguino/examples/LabviewLinxInterface/LabviewLinxInterface.ino
@@ -1,4 +1,4 @@
-/****************************************************************************************	
+/**************************************************************************************** 
 **  This is example LINX firmware for use with the Dwenguino with the serial 
 **  interface enabled.
 **
@@ -74,11 +74,11 @@ int readPullup(unsigned char numPins, unsigned char* pins, unsigned char* numRes
     
     //Read From Next Pin
     unsigned char pinNumber = pins[i];
-    pinMode(pinNumber, INPUT_PULLUP); //Set Pin As Input Pull up    		
-    retVal = retVal | (digitalRead(pinNumber) << bitOffset);	//Read Pin And Insert Value Into retVal
+    pinMode(pinNumber, INPUT_PULLUP); //Set Pin As Input Pull up        
+    retVal = retVal | (digitalRead(pinNumber) << bitOffset);  //Read Pin And Insert Value Into retVal
   }
   
-  //Store Last Byte	
+  //Store Last Byte 
   values[byteOffset] = retVal;
   
   //Set number of send bytes
@@ -91,7 +91,7 @@ int writeLCD(unsigned char numInputBytes, unsigned char* input, unsigned char* n
   input[numInputBytes] = 0x00;  // add string termination char
   String str((char*)input);     // convert ascii array to string object
   
-  pinMode(LCD_RS, OUTPUT);		// make sure command pins are output
+  pinMode(LCD_RS, OUTPUT);    // make sure command pins are output
   pinMode(LCD_RW, OUTPUT);
   pinMode(LCD_E, OUTPUT);
   dwenguinoLCD.clear();         // clear lcd
@@ -111,7 +111,7 @@ int writeLCD(unsigned char numInputBytes, unsigned char* input, unsigned char* n
     dwenguinoLCD.print(str.substring(pos, pos2));
   }
 
-  *numResponseBytes = 0;        // don't send a response
-   
-  return L_OK;
+  *numResponseBytes = 0; // don't send a response
+  
+  return L_OK;
 }
\ No newline at end of file
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/keywords.txt b/dwenguino/Dwenguino/libraries/LinxDwenguino/keywords.txt
new file mode 100644
index 0000000..c041af9
--- /dev/null
+++ b/dwenguino/Dwenguino/libraries/LinxDwenguino/keywords.txt
@@ -0,0 +1,32 @@
+###################################
+# Syntax Coloring Map For LinxDwenguino
+###################################
+
+###################################
+# Datatypes (KEYWORD1)
+###################################
+LinxDwenguino		KEYWORD1
+LinxSerialListener	KEYWORD1
+
+###################################
+# Methods and Functions (KEYWORD2)
+###################################
+Start	KEYWORD2
+Listen	KEYWORD2
+Available	KEYWORD2
+Accept	KEYWORD2
+Connected	KEYWORD2
+Close	KEYWORD2
+Exit	KEYWORD2
+
+AttachCustomCommand	KEYWORD2
+CheckForCommands	KEYWORD2
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+LinxSerialConnection	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/library.properties b/dwenguino/Dwenguino/libraries/LinxDwenguino/library.properties
new file mode 100644
index 0000000..3c0dfdd
--- /dev/null
+++ b/dwenguino/Dwenguino/libraries/LinxDwenguino/library.properties
@@ -0,0 +1,9 @@
+name=LinxDwenguino
+version=2.0.0
+author=Jelle Roets <jelle@dwengo.org>, Sam Kristoff
+maintainer=Dwengo <developers@dwengo.org>
+sentence=This library provides an interface to control and use the Dwenguino 2.0 as data acquisition board from Labview.
+paragraph=With this library Labview can communicate and control all Dwenguino functionality, this includes all analog and digital gpio ports, LCD screen, on board LEDS, buttons, buzzer, servo and DC motors.<br /> It is based on the Linx framework Written By Sam Kristoff (www.labviewmakerhub.com) but modified for the Dwenguino board by Jelle Roets (www.dwengo.org).
+category=Device Control
+url=http://www.dwengo.org/tutorials/dwenguino/LabviewInterface
+architectures=avr
\ No newline at end of file
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxDwenguino.cpp b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxDwenguino.cpp
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/LinxDwenguino.cpp
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxDwenguino.cpp
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxDwenguino.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxDwenguino.h
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/LinxDwenguino.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxDwenguino.h
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.cpp b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.cpp
similarity index 98%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.cpp
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.cpp
index 3b4f512..a9521ef 100644
--- a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.cpp
+++ b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.cpp
@@ -18,9 +18,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "utility\LinxDevice.h"
+#include "utility/LinxDevice.h"
 
-#include "utility\LinxListener.h"
+#include "utility/LinxListener.h"
 #include "LinxSerialListener.h"
 
 /****************************************************************************************
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.h
similarity index 97%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.h
index acb88ce..c1633b3 100644
--- a/dwenguino/Dwenguino/libraries/LinxDwenguino/LinxSerialListener.h
+++ b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/LinxSerialListener.h
@@ -20,8 +20,8 @@
 /****************************************************************************************
 **  Includes
 ****************************************************************************************/		
-#include "utility\LinxListener.h"
-#include "utility\LinxDevice.h"
+#include "utility/LinxListener.h"
+#include "utility/LinxDevice.h"
 
 
 /****************************************************************************************
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/config/LinxConfig.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/config/LinxConfig.h
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/config/LinxConfig.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/config/LinxConfig.h
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxDevice.cpp b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxDevice.cpp
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxDevice.cpp
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxDevice.cpp
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxDevice.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxDevice.h
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxDevice.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxDevice.h
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxListener.cpp b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxListener.cpp
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxListener.cpp
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxListener.cpp
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxListener.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxListener.h
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxListener.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxListener.h
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxWiringDevice.cpp b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxWiringDevice.cpp
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxWiringDevice.cpp
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxWiringDevice.cpp
diff --git a/dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxWiringDevice.h b/dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxWiringDevice.h
similarity index 100%
rename from dwenguino/Dwenguino/libraries/LinxDwenguino/utility/LinxWiringDevice.h
rename to dwenguino/Dwenguino/libraries/LinxDwenguino/src/utility/LinxWiringDevice.h