Updating some dirname() to __DIR__ and double to single quotes