file reorg, fixes