Reorganizing components in source tree.