maven integration. package restructuring.