Restuctured the repository