A preliminary software refactoring.