Server commit refactoring finished!

Waiting for testing with client...