Condense Listeners, Move to new folder structure