More reorganization of Facts class