Refactored namespace with UnitOfWork as a module