[sw] chapter 6: restructure files in client and server folder