Modified structure and git repo name