Deploy folder re-org #16