Refactor App-Machine-Server
Persist server and app when upload file