Moved source files for server and client into same project.