Restructured build directory