Moved files around.
Merge pull request #12 from d0ugal/adding-templates

Moved files around...