move classes to utility folder