Move new classes to db2 module