disable DB tests for now (for the build farm)
move classes around for better organization
finally rename a bunch of headers