Clearnup naming and locations of items, add ClassTag setting to Yaml, and make execute public