[DF-3347] Added switch entity creator class
[DF-185] Fixed project