Removed Views into their own feature