Changed back to two files
Seperate files for client and server