Updated structure of Repo a bit