Refactoring of folders and concatenating files