restructured direction, method, tool classes, will continue parsing work tomorrow morning