* Updated openstack cloud controller version to match kubernetes version * Rolled back file structure change