API reshuffling, starting impl. of api.security tokens.