Clean up Buildpack and Buildpack Controller

-Move reordering logic into model callbacks.

[#74579312]