restructured dir