Move Database into separate module