Reorg layout
"ant debug" builds everything... and there's an event handler