basic restructure, need to fix several tests still
indentation fix
restructure tests against new format, fixes issues
Merge pull request #89 from alphagov/immutable_vapp_template

[#62905634] Immutable VappTemplate class