Consolidate Repository and adapt consumers, Restructure BoundedContext