Remove moved files

Created by: slifty

The previous commit / PR had a mistake: it added moved files without actually removing them. Unfortunately it is already merged, so instead of rewriting history I'm just opening another PR for the second half.

Sorry for ruining all the statistics....