REF #4121 module structure changes