minor tweaks to file names and ordering to make sure everything installs properly.
minor tweaks to file names and ordering to make sure everything installs properly.