Closes #588
Closes #1858
Reorganize
Updated Version 3.0.19.066