Refactored organization, added pong functionality