restructured dir hierarchy