Rearrange the structure of this repo