Added telnet server and rearranged stuff