Add functionality to organize fact files better