Organize the includes directory