Moved Lists/Sets & fixed dependencies.