Reorganized files and directories; added Exception handler