add git log and git diff statment description
Change some project structures
Resolve conflict project structure