renamed java/aggregation file, other minor changes