Code re-structuration
Merge branch 'develop' of https://github.com/srv/valve_tracker_triton into develop