[REFACTORED] Moved to correct namespaces. [FEATURE] Added event handlers.