fixed the parser and relative paths, reorganized files