separate Controller subclasses from Controller.php
separate Parser.php classes, class name changes