Fix wrong Servlet
Fix Native Support, redo the work by adding a special package for it