Moved state to decorated value.
Moved into proper package.

Smaller javadoc and method names fixes.