Update some snippets

Mostly removing stuff I didn't use and moving stuff that used be in
sepearate files into one file
Update cdpath with respect to new folder structure