Restructure the repo