add api_version to OpenStackPoller(); re-organize the code structure a bit