Revert "Revert "Clean up Buildpack and Buildpack Controller""

This reverts commit b3875045d0a5099015b3e4517d80de7d5655469a.
Fix bug introduced when cleaning up buildpacks

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>