Moved database related classes to own package!