Relayout controller, tpl and more classes