Reorganize the structure of the repo