Seperate Swap16 and Swap32 into their own source file