Revert "Clean up Buildpack and Buildpack Controller"

This reverts commit 09d111daf031d30a20045ddab10ddeda167b12ae.