Generated files used old ghaml output. Updated to reflect new generated file structure