Move views into core.views