added structure sensors and restructuring of client