Delete views directory. Fix minor issues in files