cleanup
refactoring DecoratorWithPorts into ModelDecorator

refactoring and restructuring decorator