Rename Commands.java to Listeners.java