Unified utils in parser. Changed project structure.