Fixed broken code from reorginzation and documentation.