renamed files
added exception handlers