Maven stuff and updated build