cleanup of modules + addition of oms3 annotations inheritance for better modules doc