Change to Visitor + walker. Added tests for package,import, statements