MC: Changed the hardware folder structure