Move openstack stuff into an openstack folder
Update namespace