Reorganize structure of component