Move files back and fix compilation error.