move exceptions to corresponding namespaces
Merge remote-tracking branch 'origin/devide-exceptions'

* origin/devide-exceptions:
  move exceptions to corresponding namespaces