Commit changes for controllers and rename content.java -> PageContent to

prep for content management component