Missed a few things when rearranging the hardware directory.