Refactor project and add parser specs
Simple refactoring