reorganization of components
ui components refactoring