Re-organise class, and add bible version option