Add Makefile and update folder structure.
Update git-p4-integ
Update git-p4-integ