Folders restructured for uploading to server