Added earlier grammar to new dir structure
Refactored Annotation Processors