Few renames; also finalized templates

Finalized the structure of the suspfiles and vdef files; renamed a few
files and updated others appropriately