clean up structure and rename file