Shortened some dirs
Shortened some dirs