Reorganized
Minor cleanup and removal of legacy code for V1.36