Condense Listeners, Move to new folder structure
Merge remote-tracking branch 'origin/dev' into dev