[Tiki-users] Where to place custom code in tiki27

Hi,

I am upgrading from tiki21 to tiki27. I have two custom modules, each
with a php and a tpl file. Where should I place these files in tiki 27?
As before in /modules (for php) and templates/modules/ (for tpl)?

Thanks in advance.

Karsten