Revert "Revert "moving modals to separate files""

This reverts commit f89bd68931479b1cb113d5715f0bae7a623a481f.