src code consolidation