[ticket/12987] Moves more services

PHPBB3-12987