reorganize some components