Update paths for required files

(also, cleanup some whitespace in one file)