Reorganizing

Fixing parsing issue.