Refactor. Combine the persist and model to server, and refactor the packages