Adding subtemplate for snapshots
Some renaming
Clean up snapshot model