Re-organized all events. Moved logic code to match. Beginning work on socket programming.