Move out fish-tank to it's own repo