Preparing for the next patch, to make it more readable, this patch does 
nothing but rename or delete files.