moved some classes to logic.automated