Fixing Plugin Code for Modules/Packages