separated UDP from HTTP transfer, some refactoring/renaming