seperate out templates and data folders
Merge branch 'folders'