Build 1.1.5 - Reverting module wrappers back to working style