Additional refactor: moved last database-specific classes from deep-commons to the proper sub-project