Trying to refine structure branch for correct installation