Reoranized potions.

New setup makes more sense, but currently added potion effects aren't working at all. Ugh.