update normalization, move files around