Organize the new stuff