(cleanup) simplify dir paths