get rid of unneccessary recursively searching methods
Change classes' names