Rearranged the hardware directory a bit.