Added modularisation with oo style.

Note: Grammars are useless for now, this should be fixed soon.