Re-organized codebase#6

ps-cd merged 1 commit into

mainNIStreamer/base-streamer:mainfrom

merge_reposNIStreamer/base-streamer:merge_reposCopy head branch name to clipboard