Changing to simpler _layouts structure