Restructured build