Had to rearrange the install order so we didn't rely on files that weren't
there