Change structure of HeldStone to use branches instead of folders