re-arrange HW files