Some refactoring - rename pattern package to cases