Restructure to match OpenStack layout