Restructure build directory