Changed layout so sub directories work