Refactor - clean packaging building