Behavior

Refactored code to use URI to access classes.
Tidied up some nodes.