Move tariffUsers from users section to tariffs.tariffUsage and fix