[Modules] Fix a layering issue that is actually impacting the modules