Refactoring Deeco* to Component classes