Separate out W601, W602, W603, and W604

The rest goes under W690. This is related to #93.