Missing files after refactor