pulkit | Adding support for xrayApp into the new structure