arrange includes

attempting to better organize for later duplication. May still change