Got rid of a lot of hard-coded paths.