Reorganize distribution building around staging directory