Changes to replace the SWTP V1 code with the V2 code
27 files changed