subfolder paths fix

spaced content to my liking, hoisted some vars manually, commented out a line to allow files in subfolders to be searched and replaces to occur.