Split out some of the libs and the aggregates