Restructured the git