Made account-github and githud packages local
included the packages dirs
Resolved merge conflicts