Better linked lists and source file diversification