Continued component refactoring