Merge branch 'testing'
Client and server moved to separate folders
new file structure and some improvements