Updated _oasis, starting to remove unnecessary dependencies and clean the code
WIP big refactoring