moved class to its proper place