Berkano

Refactoring - better SOC in user api