Removed intermediate nodetypes package from AST
Some more package refactoring. Also splitted out Conditional to IfStatement and IfElseStatement
Optimized imports
Simplified grammer
Made some more grammer refactorings