Refactor Parser
Refactor Parser, extract Configuration from Project