Repo structure almost done