fixed setup issue from directory reorganization
fixed uptime measure
improved documentation.