Cleanup imports.
Move templates to template directory.