Move server methods to respective locations