Got rid of unused classes, adjusted some formatting, and moved database
constants to the aggregator package