[forge-dev] Changes to Forge Modules structure