And because of a shortcoming in the query dispatcher you'll have to rename the queries in the query files when you move them.
This is only necessary for pages directly under /www and its subdirectories. We haven't bothered fixing this because normally a site has one and only one template in /www - index.