Mavenified + removed unessesary dependency to commons.jar
Moved the demostuff to the test-location instead. makes more sense.