Restructured the repo