I renamed some classes, so now code looks better