Moved s3client and s3server into respective folders