reorganize components
more components reorganization