rm Xap\Decorator, add Xap\Decorate, mod logic for new Decorate class