cli tidy up + move class to correct filename