Refactored segmentor classes.  Still need testing.