Restructure for FH3 latest hybrid app format