renamed files and fixed bug in parser