Now uses Maven, great deal of restructuring, work towards large update.