Re-factor of server and Planning.txt