Reorganisation

+tpl/page/