Fixed licensing and Maven group id, reformatted code a bit.