Part of the database code abstraction

Cleaning up the files and adding all DB files to new package