Reorganized project to use express configuration