Reorganized project, added specific exceptions