restructured dir tree