Updated file structure anticipating YT and Twitter APIs