Did a bunch of cleanup. Removed spaces from directory names, reformatted all the code to at least be consistent with itself.