reorganizes imports
refactored Parser module