renames extraction classes more appropriately
fixup
first sketch for using execute-tags