file reorg, deploy, fixes