Normalization as separate function

And removed old files