Renamed diff generator namespace and fixed imports