reorganizing components