fixing up the git structure