included helpers in server and extracted to individual files(former commit was overwritten)
merge conflict