Rename files, get express fully working