moved class to proper package folder