changed layout, added dirs