updates modules to use new exception classes

updated includes to new file name error.h
resolve rebase compile errors