Got rid of the $dir variable in favor of __DIR__

Change-Id: Ifa5513f53105fec1113df73f3c4b1a50c77d2100