massive class reorganization
massive class reorganization
undid class reorganization
various bug fixes