small refactoring
mv ast files to new dir
refactor code
fix unindentation