add structure, rename file logic WIP