refactor structure of folders and archives