Move pattern matches and case classes so that ordering is the same
Add trivial cases for showing javascript