Removed test-directory
Moved out of main-folder, this is not mvn
Moving stuff into separate files