Refactor to more closely match Java API
Clean up, especially for Organism.
Further clean up.
Further clean up.