Reorganisation and documentation for UpTime