Moved views into a package