Fixing the git structure