Organize helpers more logically

Do a better job organizing our helper methods, in particular ApplicationHelper