Added messages import to proper locations.
Moved and changed the names of template files.