Cleaning up after refactoring release package

Signed-off-by: Phan Le <ple@pivotallabs.com>