Clean up of Exceptions (plus Caps renaming of files for PSR-0 compliance)