Cleanup 1

moved some files to split server and client