Move Decorators to Extensions
Merge branch 'hotfix/Decorators/move/Extensions'