Smaller files again

Self explanatory.