Organizing all the pieces seems to make building go better. Should have done this from the start.