Rearranged build stucture