Move monitor lists to where they make a vague bit of sense