Restructured for production server