Restructed the repo