Moved openstack package so imports are setup correctly

Change-Id: I9f97ebf6b5c0c5728f4079af759bcfd7c65c217a
Merge "Moved openstack package so imports are setup correctly"