Reorganized Server.java
Merge