Rearrange to add software portion of project