Moved Grammar to language folder

Also fixed declaration ordering.
Removed #include for nonexistent header.