Fixed up the structure of the repo