string failure checks, file reorg