Moved some files
Moved files
Updated Modal
Merge remote-tracking branch 'jahead/master'