wrote a testing script for the user part of the server api and put protocol files in own folder
also moved files
finished merging conflicts....