Move views to view folder #3351

Review-Id: 1403001