Refactoring gnunet_time