Removing database.rb, it wasn't a good abstraction