fixes #35
fixes #32
removed folder in class and updated typedef parser. Fixes #36
dependency update