Refactor: remove last traces of separate

directory for exceptions