Moved database package into epps package.
Merge remote-tracking branch 'origin/master'