Renamed Hardware/Hardware* to Hardware/*