Move some stuff to separate files, use user filter instead of modifying topic data