Refactored module structure of parsing.