Also give each type of set its own file. Updates #cleanup Signed-off-by: Chris Palmer <[email protected]>