Even more refactoring, giving NDepend a go