Added templates, fixed mount points.
Deleted some old files.