Refactor winbind configuration
Final cleanup.  Getting ready to publish
lots of restructuring