Changed folder names, updated paths

Brought branch fulldem_clip more in line with master. Will be merged.
Still need to get dem clip to work correctly.