NOTIPLT-3:  Move some classes and packages around;  fix an issue with JSON serialization that crept in with the last commit