[Connect/Streams] Refactoring the file structure to be inline with subcomponent guidelines.