Moved exceptions into packages
Merge branch 'master' of github.com:kurki13/kurki13