Added normalizePath() throughout