Moved the Lists/Sets, made sure keynames are Strings and fixed dependencies.