Refactor structure, add upload of files