Updating some packages from the Express 4.0 upgrade.
Big refactor to get better organized.