Removing the Device from each ConversionData, reorganizing the structure
to have device at the top

Change-Id: If1b32dd3240070b8a3fc897c2cd623158d6b710d
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>