re-org the repo structure