Merge "Remove sample folder in code"