restructured dir layout