Move Dive/Bubble into classes for the sake of documentation.