Restructure layout, Include modified firmware