Moving normalize and defaults to dependencies