Reorganised handling of modules, adding instructions for OSE 2.1.