31/03/14

further integration

main class restructured, thread handling etc

new test package, to structure all tests within