Restructured for deployment