Remove unused Loner
Actually set the passed container in ContainerAwareListener
Correct listener class locations
Cleanup