start to refactor server
start new version
Start to clean up