Swap16 and 32 would do better as static functions

Revert "Seperate Swap16 and Swap32 into their own source file"

This reverts commit ef6c16dd1fc91ef8257fb6755d3a1af2b4feaf09.
Change Swap16 and Swap32 to be static functions