Simplify directories structure