Switching to {{VARIABLE}} naming for folders and files
Fixing tests and renaming directories
Merge pull request #23 from krak3n/feature/issue-23

Change __%s__ to {{%s}} in rename