Changed basic structure and upload works.