Finish implementation of new package builder