System Plugin File Structure change.
Fix issues in 636350c3952daa62346f49f790035aa2c5082727