Inlined the modifier terminals and removed some other nesting
Small reordering of productions
Started working on an implode of the java grammar to the m3 AST
Moved some non-terminals higher and removed some unneeded nesting
Fixed how m3 JDT handled IO/URI, now it uses the URI resolvers