Reorganize all modals to be more modular