Moved views into correct package