Moved Database/data access layer stuff to db/