Updated organization

It makes more sense this way.
Added Set data structure