Move Tap class out of Supply role

Mainly so that we can easily check for Tappiness of a tap