Reorganize distribution building around staging directory
Reorganize distribution building around staging directory