Grammar, Fix Underscores In LITERAL_NUMBER & Start Creating Test Module Organization