GrammarParser added from SMC

- moved IoC classes around a bit