Convert to use Express 4, WIP
Removed files