Complete modal id naming scheme revision
Finish December14 modals
Rename directories