Restructure the repo'