Finished dirty hack version, moved dependencies to maven