Repo structure update