Restructure of program modularity.

This commit does a fairly major restructure in the program modularity.
All the express app configuration is pulled out to its own file.  The
main file is switched back to server.js--execute the server with
'node server.js'.  The routes are also modified for modulartiy.
Fix conflicts in server.js