move normalize module & clean up