Rename uid -> siid and start implementation of s3 connection