adjust files due to refactor