Larger refactoring where debug module has been moved into video package