Reorganize Decorator pattern structure