Begin changes to use a template url
Move files to another directory