Restructured the repo folder with additional paths