add interface for unnormalized form
reorganize definition order for better documentation
release 2.1