Updaes and reorg
New HW