Consolidated packages

Custom packages written for this app have now been consolidated into
one package from three.