component organization changes