Use sets instead of lists, put dicts in own dir

Cleaned up trailing whitespace and multiline statements.