[ticket/12374] Updated code layout

PHPBB3-12374