Moved the view definitions to a new file