BAZYNGO-736
change location of classes