Wp/refactoring/renorm