Restructured Firmware folder, minor changes