Cleaned up the AST. Changed packages and changed some classes from (abstract) class to interface