City Inventories now usable, use city-inv command for performance test.
Repackaged java classes into one package.