Simplify directories hierarchy