Removed some old code
De-nested classes. Closes #79.
Updated tests to use de-nested classes.