Reorganized some of the paths to prep installation file.