moved files from test into main folder in order to get rid of the test-jar dependency