script include to <head/> -- require.js loads scripts asynch, so won't get in the way of DOM loading.
Remove duplicate files.
More code reorganization, cleanup.