Move to view namespace