reorganize files, improve prompts and messaging language