diff --git a/PoC/7seg.ino b/PoC/7seg/7seg.ino
similarity index 100%
rename from PoC/7seg.ino
rename to PoC/7seg/7seg.ino
diff --git a/PoC/README b/PoC/README
index 99e6758..4412749 100644
--- a/PoC/README
+++ b/PoC/README
@@ -1,8 +1,31 @@
 This is the Proof of Concept code for the 4x5 Windows mock-up.
-With a 4-7Segment Display
+With a 4-7Segment Display on top
 
 It is a static mockup that should be used to make a Video and show off the theory of the project.
 
+Current structure:
+
+PoC/
+-> patternplayer
+= This plays pre-defined patterns
+-> life
+= Game of Life
+-> cheap_random
+= dirty hack to show random windows
+-> 7seg
+= 7 segment tester
+-> VdL_demo
+= Main Demo Folder for the final VdL Demo
+-> shiftout1
+= Shift register test code
+-> shiftout2
+= Shift register test code
+-> shiftout3
+= Shift register test code
+-> testcolors
+= Test the 16x32 RGB Panel
+
+
 The shift Array code is from this Tutorial page:
 
 http://arduino.cc/en/Tutorial/ShiftOut
@@ -16,3 +39,123 @@ The used module is a 16 segment element with one decimal dot (http://www.adafrui
 UHR (Ultra High Red) version
 
 We used a single in-line i(SIL) resistor to make our lives easy. http://en.wikipedia.org/wiki/Resistor
+The LED Panel is a 16x32 panel. It is to be used vertically.
+
+
+^ UP
+
+|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
+|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|
+
+We flipped it 90 degrees ClockWise (CW)
+> UP
+|- - - - - - - - - - - - - - - -|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|* * * * * * * * * * * * * * * *|
+|- - - - - - - - - - - - - - - -|
+
+The Library of course uses the regular orientation. Consider this:
+
+matrix.drawRect(x,y, sizeX, sizeY, matrix.Color888(255,255,255));
+
+x,y are the starting co-ordinates starting from top-left
+
+sizeX, sizeY will be the size of the rectangle we want to draw.
+
+Everything is in pixel (px) logically 1px == 1LED
+
+The ColorXXX() functions are used to define the color "spectrum"
+
+Color333() - 3bit color representation
+Color444() - 4bit color representation
+Color888() - 8bit color representation
+
+To simulate a grayscale is pretty difficult and needs some hacking:
+
+http://upload.wikimedia.org/wikipedia/commons/9/93/256colour.png
+
+We have 20 windows at our disposal.
+
+I chose the cheapeast and dirties path possible for the PoC and the following map gives you an overview of the addressing of the windows on the mock-up:
+
+> UP
+|- - - - - - - - - - - - - - - -|
+|X X X X X X X X X X X X X X X X|
+|X       X       X       X      |
+|X  W    X  W    X  W    X  W   |
+|X       X       X       X      |
+|X    1  X    6  X   11  X   16 |
+|X       X       X       X      |
+|X X X X X X X X X X X X X X X X|
+|X       X       X       X      |
+|X  W    X  W    X  W    X  W   |
+|X       X       X       X      |
+|X    2  X    7  X   12  X   17 |
+|X       X       X       X      |
+|X X X X X X X X X X X X X X X X|
+|X       X       X       X      |
+|X  W    X  W    X  W    X  W   |
+|X       X       X       X      |
+|X    3  X    8  X   13  X   18 |
+|X       X       X       X      |
+|X X X X X X X X X X X X X X X X|
+|X       X       X       X      |
+|X  W    X  W    X  W    X  W   |
+|X       X       X       X      |
+|X    4  X    9  X   14  X   19 |
+|X       X       X       X      |
+|X X X X X X X X X X X X X X X X|
+|X       X       X       X      |
+|X  W    X  W    X  W    X  W   |
+|X       X       X       X      |
+|X    5  X   10  X   15  X   20 |
+|X       X       X       X      |
+|X X X X X X X X X X X X X X X X|
+|X X X X X X X X X X X X X X X X|
+|X X X X X X X X X X X X X X X X|
diff --git a/PoC/cheap_random/README b/PoC/cheap_random/README
deleted file mode 100644
index ee3818a..0000000
--- a/PoC/cheap_random/README
+++ /dev/null
@@ -1,120 +0,0 @@
-The LED Panel is a 16x32 panel. It is to be used vertically.
-
-
-^ UP
-
-|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *|
-|- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -|
-
-We flipped it 90 degrees ClockWise (CW)
-> UP
-|- - - - - - - - - - - - - - - -|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|* * * * * * * * * * * * * * * *|
-|- - - - - - - - - - - - - - - -|
-
-The Library of course uses the regular orientation. Consider this:
-
-matrix.drawRect(x,y, sizeX, sizeY, matrix.Color888(255,255,255));
-
-x,y are the starting co-ordinates starting from top-left
-
-sizeX, sizeY will be the size of the rectangle we want to draw.
-
-Everything is in pixel (px) logically 1px == 1LED
-
-The ColorXXX() functions are used to define the color "spectrum"
-
-Color333() - 3bit color representation
-Color444() - 4bit color representation
-Color888() - 8bit color representation
-
-To simulate a grayscale is pretty difficult and needs some hacking:
-
-http://upload.wikimedia.org/wikipedia/commons/9/93/256colour.png
-
-We have 20 windows at our disposal.
-
-I chose the cheapeast and dirties path possible for the PoC and the following map gives you an overview of the addressing of the windows on the mock-up:
-
-> UP
-|- - - - - - - - - - - - - - - -|
-|X X X X X X X X X X X X X X X X|
-|X       X       X       X      |
-|X  W    X  W    X  W    X  W   |
-|X       X       X       X      |
-|X    1  X    6  X   11  X   16 |
-|X       X       X       X      |
-|X X X X X X X X X X X X X X X X|
-|X       X       X       X      |
-|X  W    X  W    X  W    X  W   |
-|X       X       X       X      |
-|X    2  X    7  X   12  X   17 |
-|X       X       X       X      |
-|X X X X X X X X X X X X X X X X|
-|X       X       X       X      |
-|X  W    X  W    X  W    X  W   |
-|X       X       X       X      |
-|X    3  X    8  X   13  X   18 |
-|X       X       X       X      |
-|X X X X X X X X X X X X X X X X|
-|X       X       X       X      |
-|X  W    X  W    X  W    X  W   |
-|X       X       X       X      |
-|X    4  X    9  X   14  X   19 |
-|X       X       X       X      |
-|X X X X X X X X X X X X X X X X|
-|X       X       X       X      |
-|X  W    X  W    X  W    X  W   |
-|X       X       X       X      |
-|X    5  X   10  X   15  X   20 |
-|X       X       X       X      |
-|X X X X X X X X X X X X X X X X|
-|X X X X X X X X X X X X X X X X|
-|X X X X X X X X X X X X X X X X|
diff --git a/PoC/cheap_random/life/life.pde b/PoC/cheap_random/life/life.pde
deleted file mode 120000
index d4923a7..0000000
--- a/PoC/cheap_random/life/life.pde
+++ /dev/null
@@ -1 +0,0 @@
-life.ino
\ No newline at end of file
diff --git a/PoC/cheap_random/life/life.ino b/PoC/life/life.ino
similarity index 100%
rename from PoC/cheap_random/life/life.ino
rename to PoC/life/life.ino
diff --git a/PoC/cheap_random/patternplayer/patternplayer.ino b/PoC/patternplayer/patternplayer.ino
similarity index 100%
rename from PoC/cheap_random/patternplayer/patternplayer.ino
rename to PoC/patternplayer/patternplayer.ino
diff --git a/PoC/shiftout1.ino b/PoC/shiftout1/shiftout1.ino
similarity index 100%
rename from PoC/shiftout1.ino
rename to PoC/shiftout1/shiftout1.ino
diff --git a/PoC/shiftout2.ino b/PoC/shiftout2/shiftout2.ino
similarity index 100%
rename from PoC/shiftout2.ino
rename to PoC/shiftout2/shiftout2.ino
diff --git a/PoC/shiftout3.ino b/PoC/shiftout3/shiftout3.ino
similarity index 100%
rename from PoC/shiftout3.ino
rename to PoC/shiftout3/shiftout3.ino
diff --git a/PoC/testcolors_16x32.ino b/PoC/testcolors/testcolors_16x32.ino
similarity index 100%
rename from PoC/testcolors_16x32.ino
rename to PoC/testcolors/testcolors_16x32.ino