organized repo and also debugged/improved parser