Restructuration of the code

New names, predict + filter = filter