WattApi reorganization