Extracted the random data generator and the unique user id and session, to proper categories
Fixed the headers
Reuse of generateRandomUniqueId:

Signed-off-by: Miguel M. Almeida <miguelcma@gmail.com>