finished layout, added directories