Reorganized listener structure in multiple files