Major refactoring of file structure
Added client and server proxy classes