Part 1 fixing dir capitalization
Part 2 fixing dir capitalization