Cleanup imports, modify skill editors to use filters/subclasses