Simplify layouts folder