Kiran | Changes test directory structure.