Reorganizing. Removing hard-coded paths.