Changed the structure of this repo