Moving Exceptions to proper namespace