clip.h -> Clip.h, updated appropriate files