Reorganise project with Oasis support

I'll send you a real pull request soon.