Refactored Parser. Reduced access to components across project.