move coffee spec specific Switch definitions into separate block