merged folders, npm install and npm start now works correctly