Letting type switch be part of match expression
Moved switch on type to case folder
On is an alias to match