Moved templates dir
New bundles