reorganizing
fix _oasis to reflect removed module
various cleanup
compilation; file simplification