* Also moved notebook conversion classes to a common folder, and moved several conversion utility methods to a common file.