I modified some of the import lines to be more 'Openstack Friendly' as well as actually include some of the correct references.