Restructure the repo setup