Reorg w/ subdirectories for FW and HW