run server from proper directory
merge with previous changes