rebase for simpler project and remove views
remove unused views and wrapper