merged the templates into the app directory but hopefully the changes are being tracked