Added code for Name disambiguation. Fixed CFG for field access. Moved test cases to the correct directory. Not tested yet