Use singular form for directory name

tools/ ->
tool/

test/fixtures/ ->
test/fixture/