Shorten a line
Simplify dir structure