Put modals under their own directory
Rename template files
Split controllers and factories

Also standardized file names
Make call to `modal.result` more obvious
Merge branch 'reorganize-modals'