Restructure build folder