[fix] Reorganise project with Oasis support