move toStr to parser and rename files