Restructured the project to use packages, rearranged the file structure to match the package structure.  Files are now grouped into the Server and Client packages to keep them separate and tidy :)