Move main package dir.
Commonize template tags.
Update template.
Merge pull request #3 from jonfaustman/feature/import

Simplify import.