MOB-877 module implementation, module stuff not used yet because of include paths situation