I had a lot of fun moving *.php from templates/apps/* to build/*/templates. It was mostly done automatically. If you had a lot of changes lying around in templates/apps/* you can revert and commit your stuff. I've tested most of the changes, but I'm sure I missed some things. enjoy, Kasper