Package restructuring and maven updates.