More reorganizations. Refactoring sets (currently broken)