moved classificator to separate class