Parser seems to work now. Made some renaming of modules and classes.