Move patterns to separate directory, add driver