Moved Views code to include files.