Restructured the repo. More organized