Reorganize facts
Add functionality to organize fact files better