Restructure build