Rearranging the components for angular dependencies.