Fixes #2 -  Move Express stuff into its own files