Remove Listener and moved to maven