.......... [DEV-536] moved all classes inside of the include/classes subfolders, dropped support of old style class names