refactoring of consumer projects