Merge #26: Refactoring (file server and client) + rsync integration