Simple Clean up

Clean up event listeners (Change API addition)
Add test/java directories