Dir to const

Sending in for review