dir layout and typo