Renamed paths to make the hw more generic