* reorder classes * make context creator method a module level function * class method for creating an instance from a template * fix primary host selection code * use timezone.now() instead of datetime.now() to get timezone aware dates * remove obsolete methods and implementations (leaving TODOs)