moved some files and structured the parser and services