redo folder structure for server/client