Restructuring the git repo