Refactory uptime modules structure