Moved switch on type to case folder