move exceptions to package exceptions
repackaging
cleanup