Server.java moved to new package