Restructuring for Rightscale support