Rename Listener Switch move it a different package.