reorg code, adding initial gapi yt search