Change entry point and start-server.sh