Changed to maven, moved all dependancies across